Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tools/simulator: support deleting a specified store #8246

Merged
merged 5 commits into from
Jun 21, 2024
Merged

tools/simulator: support deleting a specified store #8246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e912e85
make add/remove node work fine
HuSharp Jun 5, 2024
abf9742
make static happy
HuSharp Jun 7, 2024
1f0233b
Merge remote-tracking branch 'upstream/master' into simulator_add_node
HuSharp Jun 7, 2024
8cd1cdd
Merge branch 'master' into simulator_add_node
HuSharp Jun 13, 2024
5c83eae
Merge branch 'master' into simulator_add_node
ti-chi-bot[bot] Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions conf/simconfig.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# PD Simulator Configuration

[tick]
## the tick interval when starting PD inside (default: "100ms")
sim-tick-interval = "100ms"
total-store = 10
total-region = 10000
case-name = "balance-leader"

[store]
## the capacity size of a new store in GB (default: 1024)
Expand All @@ -11,8 +13,8 @@ store-capacity = 1024
store-available = 1024
## the io rate of a new store in MB/s (default: 40)
store-io-per-second = 40
## the version of a new store (default: "2.1.0")
store-version = "2.1.0"
## the version of a new store (default: "8.1.0")
store-version = "8.1.0"

## the meaning of these configurations below are similar with config.toml
[server]
Expand Down
21 changes: 16 additions & 5 deletions tools/pd-simulator/simulator/cases/balance_leader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ func newBalanceLeader(config *sc.SimConfig) *Case {

totalStore := config.TotalStore
totalRegion := config.TotalRegion
allStores := make(map[uint64]struct{}, totalStore)
replica := int(config.ServerConfig.Replication.MaxReplicas)
for i := 0; i < totalStore; i++ {
id := simutil.IDAllocator.NextID()
simCase.Stores = append(simCase.Stores, &Store{
ID: simutil.IDAllocator.NextID(),
ID: id,
Status: metapb.StoreState_Up,
})
allStores[id] = struct{}{}
}

leaderStoreID := simCase.Stores[totalStore-1].ID
Expand All @@ -58,10 +61,18 @@ func newBalanceLeader(config *sc.SimConfig) *Case {
})
}

simCase.Checker = func(regions *core.RegionsInfo, _ []info.StoreStats) bool {
for i := 1; i <= totalStore; i++ {
leaderCount := regions.GetStoreLeaderCount(uint64(i))
if !isUniform(leaderCount, totalRegion/totalStore) {
simCase.Checker = func(stores []*metapb.Store, regions *core.RegionsInfo, _ []info.StoreStats) bool {
Copy link
Member

@rleungx rleungx Jun 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this checker?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I think we can keep the logic for previous cases

for _, store := range stores {
if store.NodeState == metapb.NodeState_Removed {
delete(allStores, store.GetId())
}
}
if len(allStores) == 0 {
return false
}
for storeID := range allStores {
leaderCount := regions.GetStoreLeaderCount(storeID)
if !isUniform(leaderCount, totalRegion/len(allStores)) {
return false
}
}
Expand Down
28 changes: 18 additions & 10 deletions tools/pd-simulator/simulator/cases/balance_region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func newRedundantBalanceRegion(config *sc.SimConfig) *Case {
totalStore := config.TotalStore
totalRegion := config.TotalRegion
replica := int(config.ServerConfig.Replication.MaxReplicas)
allStores := make(map[uint64]struct{}, totalStore)

for i := 0; i < totalStore; i++ {
s := &Store{
Expand All @@ -40,6 +41,7 @@ func newRedundantBalanceRegion(config *sc.SimConfig) *Case {
s.HasExtraUsedSpace = true
}
simCase.Stores = append(simCase.Stores, s)
allStores[s.ID] = struct{}{}
}

for i := 0; i < totalRegion; i++ {
Expand All @@ -57,21 +59,27 @@ func newRedundantBalanceRegion(config *sc.SimConfig) *Case {
})
}

storesLastUpdateTime := make([]int64, totalStore+1)
storeLastAvailable := make([]uint64, totalStore+1)
simCase.Checker = func(_ *core.RegionsInfo, stats []info.StoreStats) bool {
storesLastUpdateTime := make(map[uint64]int64, totalStore)
storeLastAvailable := make(map[uint64]uint64, totalStore)
simCase.Checker = func(stores []*metapb.Store, _ *core.RegionsInfo, stats []info.StoreStats) bool {
for _, store := range stores {
if store.NodeState == metapb.NodeState_Removed {
delete(allStores, store.GetId())
}
}

curTime := time.Now().Unix()
for i := 1; i <= totalStore; i++ {
available := stats[i].GetAvailable()
if curTime-storesLastUpdateTime[i] > 60 {
if storeLastAvailable[i] != available {
for storeID := range allStores {
available := stats[storeID].GetAvailable()
if curTime-storesLastUpdateTime[storeID] > 60 {
if storeLastAvailable[storeID] != available {
return false
}
if stats[i].ToCompactionSize != 0 {
if stats[storeID].ToCompactionSize != 0 {
return false
}
storesLastUpdateTime[i] = curTime
storeLastAvailable[i] = available
storesLastUpdateTime[storeID] = curTime
storeLastAvailable[storeID] = available
} else {
return false
}
Expand Down
2 changes: 1 addition & 1 deletion tools/pd-simulator/simulator/cases/cases.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type Region struct {
}

// CheckerFunc checks if the scheduler is finished.
type CheckerFunc func(*core.RegionsInfo, []info.StoreStats) bool
type CheckerFunc func([]*metapb.Store, *core.RegionsInfo, []info.StoreStats) bool

// Case represents a test suite for simulator.
type Case struct {
Expand Down
93 changes: 60 additions & 33 deletions tools/pd-simulator/simulator/cases/diagnose_label_isolation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,22 @@ func newLabelNotMatch1(_ *sc.SimConfig) *Case {

num1, num2 := 3, 1
storeNum, regionNum := num1+num2, 200
allStores := make(map[uint64]struct{}, storeNum+1)
for i := 0; i < num1; i++ {
id := IDAllocator.nextID()
simCase.Stores = append(simCase.Stores, &Store{
ID: id,
Status: metapb.StoreState_Up,
Labels: []*metapb.StoreLabel{{Key: "host", Value: fmt.Sprintf("host%d", id)}},
})
allStores[id] = struct{}{}
}
id := IDAllocator.nextID()
simCase.Stores = append(simCase.Stores, &Store{
ID: IDAllocator.nextID(),
ID: id,
Status: metapb.StoreState_Up,
})
allStores[id] = struct{}{}

for i := 0; i < regionNum; i++ {
peers := []*metapb.Peer{
Expand All @@ -61,24 +65,30 @@ func newLabelNotMatch1(_ *sc.SimConfig) *Case {
})
}

storesLastUpdateTime := make([]int64, storeNum+1)
storeLastAvailable := make([]uint64, storeNum+1)
simCase.Checker = func(_ *core.RegionsInfo, stats []info.StoreStats) bool {
storesLastUpdateTime := make(map[uint64]int64, storeNum+1)
storeLastAvailable := make(map[uint64]uint64, storeNum+1)
simCase.Checker = func(stores []*metapb.Store, _ *core.RegionsInfo, stats []info.StoreStats) bool {
for _, store := range stores {
if store.NodeState == metapb.NodeState_Removed {
delete(allStores, store.GetId())
}
}

res := true
curTime := time.Now().Unix()
storesAvailable := make([]uint64, 0, storeNum+1)
for i := 1; i <= storeNum; i++ {
available := stats[i].GetAvailable()
for storeID := range allStores {
available := stats[storeID].GetAvailable()
storesAvailable = append(storesAvailable, available)
if curTime-storesLastUpdateTime[i] > 360 {
if storeLastAvailable[i] != available {
if curTime-storesLastUpdateTime[storeID] > 360 {
if storeLastAvailable[storeID] != available {
res = false
}
if stats[i].ToCompactionSize != 0 {
if stats[storeID].ToCompactionSize != 0 {
res = false
}
storesLastUpdateTime[i] = curTime
storeLastAvailable[i] = available
storesLastUpdateTime[storeID] = curTime
storeLastAvailable[storeID] = available
} else {
res = false
}
Expand All @@ -95,21 +105,24 @@ func newLabelIsolation1(_ *sc.SimConfig) *Case {

num1, num2 := 2, 2
storeNum, regionNum := num1+num2, 300
allStores := make(map[uint64]struct{}, storeNum+1)
for i := 0; i < num1; i++ {
id := IDAllocator.nextID()
simCase.Stores = append(simCase.Stores, &Store{
ID: id,
Status: metapb.StoreState_Up,
Labels: []*metapb.StoreLabel{{Key: "host", Value: fmt.Sprintf("host%d", id)}},
})
allStores[id] = struct{}{}
}
id := IDAllocator.GetID() + 1
for i := 0; i < num2; i++ {
id := IDAllocator.nextID()
simCase.Stores = append(simCase.Stores, &Store{
ID: IDAllocator.nextID(),
ID: id,
Status: metapb.StoreState_Up,
Labels: []*metapb.StoreLabel{{Key: "host", Value: fmt.Sprintf("host%d", id)}},
})
allStores[id] = struct{}{}
}

for i := 0; i < regionNum; i++ {
Expand All @@ -127,24 +140,30 @@ func newLabelIsolation1(_ *sc.SimConfig) *Case {
})
}

storesLastUpdateTime := make([]int64, storeNum+1)
storeLastAvailable := make([]uint64, storeNum+1)
simCase.Checker = func(_ *core.RegionsInfo, stats []info.StoreStats) bool {
storesLastUpdateTime := make(map[uint64]int64, storeNum)
storeLastAvailable := make(map[uint64]uint64, storeNum)
simCase.Checker = func(stores []*metapb.Store, _ *core.RegionsInfo, stats []info.StoreStats) bool {
for _, store := range stores {
if store.NodeState == metapb.NodeState_Removed {
delete(allStores, store.GetId())
}
}

res := true
curTime := time.Now().Unix()
storesAvailable := make([]uint64, 0, storeNum+1)
for i := 1; i <= storeNum; i++ {
available := stats[i].GetAvailable()
for storeID := range allStores {
available := stats[storeID].GetAvailable()
storesAvailable = append(storesAvailable, available)
if curTime-storesLastUpdateTime[i] > 360 {
if storeLastAvailable[i] != available {
if curTime-storesLastUpdateTime[storeID] > 360 {
if storeLastAvailable[storeID] != available {
res = false
}
if stats[i].ToCompactionSize != 0 {
if stats[storeID].ToCompactionSize != 0 {
res = false
}
storesLastUpdateTime[i] = curTime
storeLastAvailable[i] = available
storesLastUpdateTime[storeID] = curTime
storeLastAvailable[storeID] = available
} else {
res = false
}
Expand All @@ -160,12 +179,14 @@ func newLabelIsolation2(_ *sc.SimConfig) *Case {
simCase.Labels = []string{"dc", "zone", "host"}

storeNum, regionNum := 5, 200
allStores := make(map[uint64]struct{}, storeNum)
for i := 0; i < storeNum; i++ {
id := IDAllocator.nextID()
simCase.Stores = append(simCase.Stores, &Store{
ID: id,
Status: metapb.StoreState_Up,
})
allStores[id] = struct{}{}
}
simCase.Stores[0].Labels = []*metapb.StoreLabel{{Key: "dc", Value: "dc1"}, {Key: "zone", Value: "zone1"}, {Key: "host", Value: "host1"}}
simCase.Stores[1].Labels = []*metapb.StoreLabel{{Key: "dc", Value: "dc1"}, {Key: "zone", Value: "zone1"}, {Key: "host", Value: "host2"}}
Expand All @@ -188,24 +209,30 @@ func newLabelIsolation2(_ *sc.SimConfig) *Case {
})
}

storesLastUpdateTime := make([]int64, storeNum+1)
storeLastAvailable := make([]uint64, storeNum+1)
simCase.Checker = func(_ *core.RegionsInfo, stats []info.StoreStats) bool {
storesLastUpdateTime := make(map[uint64]int64, storeNum)
storeLastAvailable := make(map[uint64]uint64, storeNum)
simCase.Checker = func(stores []*metapb.Store, _ *core.RegionsInfo, stats []info.StoreStats) bool {
for _, store := range stores {
if store.NodeState == metapb.NodeState_Removed {
delete(allStores, store.GetId())
}
}

res := true
curTime := time.Now().Unix()
storesAvailable := make([]uint64, 0, storeNum+1)
for i := 1; i <= storeNum; i++ {
available := stats[i].GetAvailable()
for storeID := range allStores {
available := stats[storeID].GetAvailable()
storesAvailable = append(storesAvailable, available)
if curTime-storesLastUpdateTime[i] > 360 {
if storeLastAvailable[i] != available {
if curTime-storesLastUpdateTime[storeID] > 360 {
if storeLastAvailable[storeID] != available {
res = false
}
if stats[i].ToCompactionSize != 0 {
if stats[storeID].ToCompactionSize != 0 {
res = false
}
storesLastUpdateTime[i] = curTime
storeLastAvailable[i] = available
storesLastUpdateTime[storeID] = curTime
storeLastAvailable[storeID] = available
} else {
res = false
}
Expand Down
Loading
Loading