-
Notifications
You must be signed in to change notification settings - Fork 727
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
scheduler: extract storage operations to schedulerConfig interface (#…
- Loading branch information
Showing
20 changed files
with
254 additions
and
298 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // Copyright 2024 TiKV Project Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package schedulers | ||
|
|
||
| import ( | ||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/failpoint" | ||
| "github.com/tikv/pd/pkg/storage/endpoint" | ||
| ) | ||
|
|
||
| type schedulerConfig interface { | ||
| save() error | ||
| load(any) error | ||
| init(name string, storage endpoint.ConfigStorage, data any) | ||
| } | ||
|
|
||
| type baseSchedulerConfig struct { | ||
| name string | ||
| storage endpoint.ConfigStorage | ||
|
|
||
| // data is the config of the scheduler. | ||
| data any | ||
| } | ||
|
|
||
| func (b *baseSchedulerConfig) init(name string, storage endpoint.ConfigStorage, data any) { | ||
| b.name = name | ||
| b.storage = storage | ||
| b.data = data | ||
| } | ||
|
|
||
| func (b *baseSchedulerConfig) save() error { | ||
| data, err := EncodeConfig(b.data) | ||
| failpoint.Inject("persistFail", func() { | ||
| err = errors.New("fail to persist") | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return b.storage.SaveSchedulerConfig(b.name, data) | ||
| } | ||
|
|
||
| func (b *baseSchedulerConfig) load(v any) error { | ||
| data, err := b.storage.LoadSchedulerConfig(b.name) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return DecodeConfig([]byte(data), v) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // Copyright 2024 TiKV Project Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package schedulers | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "github.com/tikv/pd/pkg/storage" | ||
| ) | ||
|
|
||
| func TestSchedulerConfig(t *testing.T) { | ||
| s := storage.NewStorageWithMemoryBackend() | ||
|
|
||
| type testConfig struct { | ||
| schedulerConfig | ||
| Value string `json:"value"` | ||
| } | ||
|
|
||
| cfg := &testConfig{ | ||
| schedulerConfig: &baseSchedulerConfig{}, | ||
| } | ||
| cfg.init("test", s, cfg) | ||
|
|
||
| cfg.Value = "test" | ||
| require.NoError(t, cfg.save()) | ||
| newTc := &testConfig{} | ||
| require.NoError(t, cfg.load(newTc)) | ||
| require.Equal(t, cfg.Value, newTc.Value) | ||
|
|
||
| // config with another name cannot loaded the previous config | ||
| cfg2 := &testConfig{ | ||
| schedulerConfig: &baseSchedulerConfig{}, | ||
| } | ||
| cfg2.init("test2", s, cfg2) | ||
| // report error because the config is empty and cannot be decoded | ||
| require.Error(t, cfg2.load(newTc)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.