resolve the conflicts

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Aug 10, 2023 · 4401721 · 4401721
1 parent 07ac843
commit 4401721
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -1059,7 +1059,7 @@ func (c *RaftCluster) processRegionHeartbeat(region *core.RegionInfo) error {
 	if err != nil {
 		return err
 	}
-	region.Inherit(origin, c.GetPersistOptions().GetStoreConfig().IsEnableRegionBucket())
+	region.Inherit(origin, c.GetStoreConfig().IsEnableRegionBucket())
 
 	c.hotStat.CheckWriteAsync(statistics.NewCheckExpiredItemTask(region))
 	c.hotStat.CheckReadAsync(statistics.NewCheckExpiredItemTask(region))

diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
@@ -1458,7 +1458,7 @@ func TestStoreConfigSync(t *testing.T) {
 	re.Empty(opt.GetStoreConfig())
 	err = opt.Reload(tc.GetStorage())
 	re.NoError(err)
-	re.Equal(tc.GetPersistOptions().GetStoreConfig(), opt.GetStoreConfig())
+	re.Equal(tc.GetOpts().(*config.PersistOptions).GetStoreConfig(), opt.GetStoreConfig())
 }
 
 func TestUpdateStorePendingPeerCount(t *testing.T) {