*: make nogo happy

pingcap · Aug 8, 2023 · cd5ce69 · cd5ce69
1 parent 7afe1db
commit cd5ce69
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/server/handler/tests/BUILD.bazel b/server/handler/tests/BUILD.bazel
@@ -9,7 +9,7 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
-    shard_count = 35,
+    shard_count = 36,
     deps = [
         "//config",
         "//ddl",

diff --git a/server/handler/tests/http_handler_test.go b/server/handler/tests/http_handler_test.go
@@ -1261,7 +1261,7 @@ func TestUpgrade(t *testing.T) {
 	// check the result
 	se, err := session.CreateSession(ts.store)
 	require.NoError(t, err)
-	isUpgrading, err := session.IsUpgrading(se)
+	isUpgrading, err := session.IsUpgradingClusterState(se)
 	require.NoError(t, err)
 	require.True(t, isUpgrading)
 
@@ -1279,7 +1279,7 @@ func TestUpgrade(t *testing.T) {
 	// check the result
 	se, err = session.CreateSession(ts.store)
 	require.NoError(t, err)
-	isUpgrading, err = session.IsUpgrading(se)
+	isUpgrading, err = session.IsUpgradingClusterState(se)
 	require.NoError(t, err)
 	require.True(t, isUpgrading)
 
@@ -1297,7 +1297,7 @@ func TestUpgrade(t *testing.T) {
 	// check the result
 	se, err = session.CreateSession(ts.store)
 	require.NoError(t, err)
-	isUpgrading, err = session.IsUpgrading(se)
+	isUpgrading, err = session.IsUpgradingClusterState(se)
 	require.NoError(t, err)
 	require.False(t, isUpgrading)
 
@@ -1315,7 +1315,7 @@ func TestUpgrade(t *testing.T) {
 	// check the result
 	se, err = session.CreateSession(ts.store)
 	require.NoError(t, err)
-	isUpgrading, err = session.IsUpgrading(se)
+	isUpgrading, err = session.IsUpgradingClusterState(se)
 	require.NoError(t, err)
 	require.False(t, isUpgrading)
 }
diff --git a/server/http_handler.go b/server/http_handler.go
@@ -122,7 +122,7 @@ func (h ClusterUpgradeHandler) startUpgrade() (hasDone bool, err error) {
 	}
 	defer se.Close()
 
-	isUpgrading, err := session.IsUpgrading(se)
+	isUpgrading, err := session.IsUpgradingClusterState(se)
 	if err != nil {
 		return false, err
 	}
@@ -141,7 +141,7 @@ func (h ClusterUpgradeHandler) finishUpgrade() (hasDone bool, err error) {
 	}
 	defer se.Close()
 
-	isUpgrading, err := session.IsUpgrading(se)
+	isUpgrading, err := session.IsUpgradingClusterState(se)
 	if err != nil {
 		return false, err
 	}

diff --git a/session/bootstrap.go b/session/bootstrap.go
@@ -1318,7 +1318,7 @@ func SyncNormalRunning(s Session) error {
 			dom := domain.GetDomain(s)
 			//nolint: errcheck
 			dom.DDL().StateSyncer().UpdateGlobalState(context.Background(), syncer.NewStateInfo(syncer.StateNormalRunning))
-			failpoint.Return()
+			failpoint.Return(nil)
 		}
 	})
 
@@ -1342,7 +1342,8 @@ func SyncNormalRunning(s Session) error {
 	return nil
 }
 
-func IsUpgrading(s Session) (bool, error) {
+// IsUpgradingClusterState checks whether the global state is upgrading.
+func IsUpgradingClusterState(s Session) (bool, error) {
 	dom := domain.GetDomain(s)
 	ctx, cancelFunc := context.WithTimeout(context.Background(), 3*time.Second)
 	defer cancelFunc()