From 4e4bc69f21a614132f88bb8fa4128f5727d0d3ed Mon Sep 17 00:00:00 2001
From: "kevin.qiao" <kevin.qiao@vesoft.com>
Date: Mon, 6 Nov 2023 17:25:29 +0800
Subject: [PATCH] fix session related flags (#387)

---
 apis/apps/v1alpha1/template.go             | 2 --
 pkg/controller/component/graphd_updater.go | 5 ++++-
 pkg/controller/component/helper.go         | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apis/apps/v1alpha1/template.go b/apis/apps/v1alpha1/template.go
index b2e7418..c912e19 100644
--- a/apis/apps/v1alpha1/template.go
+++ b/apis/apps/v1alpha1/template.go
@@ -41,8 +41,6 @@ var DynamicFlags = map[string]string{
 	"rebuild_index_part_rate_limit":               "4194304",
 	"prioritize_intra_zone_reading":               "false",
 	"stick_to_intra_zone_on_failure":              "false",
-	"sync_meta_when_use_space":                    "false",
-	"validate_session_timestamp":                  "true",
 }
 
 const (
diff --git a/pkg/controller/component/graphd_updater.go b/pkg/controller/component/graphd_updater.go
index e98f3a8..61bf534 100644
--- a/pkg/controller/component/graphd_updater.go
+++ b/pkg/controller/component/graphd_updater.go
@@ -45,7 +45,10 @@ func (g *graphUpdater) Update(
 		return nil
 	}
 
-	if nc.Status.Metad.Phase == v1alpha1.UpdatePhase {
+	if nc.Status.Metad.Phase == v1alpha1.UpdatePhase ||
+		nc.Status.Storaged.Phase == v1alpha1.UpdatePhase ||
+		nc.Status.Storaged.Phase == v1alpha1.ScaleInPhase ||
+		nc.Status.Storaged.Phase == v1alpha1.ScaleOutPhase {
 		return setLastConfig(oldUnstruct, newUnstruct)
 	}
 
diff --git a/pkg/controller/component/helper.go b/pkg/controller/component/helper.go
index a056060..9bd38a0 100644
--- a/pkg/controller/component/helper.go
+++ b/pkg/controller/component/helper.go
@@ -199,8 +199,8 @@ func syncConfigMap(
 	if cfg != nil {
 		namespace := component.GetNamespace()
 		clusterName := component.GetClusterName()
-		flags := staticFlags(cfg)
-		klog.V(3).Infof("cluster [%s/%s] sync %s configmap with custom static configs %v", namespace, clusterName,
+		flags := staticOrStartupFlags(cfg)
+		klog.V(3).Infof("cluster [%s/%s] sync %s configmap with custom static or startup configs %v", namespace, clusterName,
 			component.ComponentType().String(), flags)
 		customConf := config.AppendCustomConfig(template, flags)
 		cm.Data[cmKey] = customConf
@@ -213,7 +213,7 @@ func syncConfigMap(
 	return cm, cmHash, nil
 }
 
-func staticFlags(config map[string]string) map[string]string {
+func staticOrStartupFlags(config map[string]string) map[string]string {
 	static := make(map[string]string)
 	for k, v := range config {
 		if _, ok := v1alpha1.DynamicFlags[k]; !ok {