fix(objectnode): fix s3qos zero nodenum

Signed-off-by: tangdeyi <[email protected]>
sejust · Aug 31, 2023 · 210de3e · 210de3e
1 parent 95c3c12
commit 210de3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/objectnode/ratelimit.go b/objectnode/ratelimit.go
@@ -271,6 +271,12 @@ func (o *ObjectNode) Reload(data []byte) error {
 	}
 	apiLimitConf := s3QosResponse.ApiLimitConf
 	s3NodeNum := s3QosResponse.Nodes
+	if s3NodeNum == 0 {
+		o.limitMutex.Lock()
+		o.rateLimit = &NullRateLimit{}
+		o.limitMutex.Unlock()
+		return nil
+	}
 	for _, userLimitConf := range apiLimitConf {
 		for uid, bandWidthQuota := range userLimitConf.BandWidthQuota {
 			quota := bandWidthQuota / s3NodeNum

diff --git a/objectnode/server.go b/objectnode/server.go
@@ -318,6 +318,9 @@ func handleStart(s common.Server, cfg *config.Config) (err error) {
 	err = reloadconf.StartReload(reloadConf, o.Reload)
 	if err != nil {
 		log.LogWarnf("handleStart: GetS3QoSInfo err(%v)", err)
+		o.limitMutex.Lock()
+		o.rateLimit = &NullRateLimit{}
+		o.limitMutex.Unlock()
 	}
 
 	// start rest api