Fix NPE panic on SyncCluster failure (#4246)

m3db · Sep 12, 2023 · b0a45ac · b0a45ac
1 parent 9e00a75
commit b0a45ac
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/src/dbnode/server/server.go b/src/dbnode/server/server.go
@@ -852,28 +852,34 @@ func Run(runOpts RunOptions) {
 		if err != nil {
 			logger.Warn("could not create handler options for debug writer", zap.Error(err))
 		} else {
-			envCfgCluster, err := envConfig.Services.SyncCluster()
-			if err != nil || envCfgCluster.Service == nil {
-				logger.Warn("could not get cluster config for debug writer",
+			if envConfig.Services == nil || len(envConfig.Services) == 0 {
+				logger.Warn("no DynamicConfiguration set; not configuring debug writer",
 					zap.Error(err),
-					zap.Bool("envCfgClusterServiceIsNil", envCfgCluster.Service == nil))
+				)
 			} else {
-				debugWriter, err = extdebug.NewPlacementAndNamespaceZipWriterWithDefaultSources(
-					cpuProfileDuration,
-					syncCfg.ClusterClient,
-					handlerOpts,
-					[]handleroptions.ServiceNameAndDefaults{
-						{
-							ServiceName: handleroptions.M3DBServiceName,
-							Defaults: []handleroptions.ServiceOptionsDefault{
-								handleroptions.WithDefaultServiceEnvironment(envCfgCluster.Service.Env),
-								handleroptions.WithDefaultServiceZone(envCfgCluster.Service.Zone),
+				envCfgCluster, err := envConfig.Services.SyncCluster()
+				if err != nil {
+					logger.Warn("could not get cluster config for debug writer",
+						zap.Error(err),
+					)
+				} else {
+					debugWriter, err = extdebug.NewPlacementAndNamespaceZipWriterWithDefaultSources(
+						cpuProfileDuration,
+						syncCfg.ClusterClient,
+						handlerOpts,
+						[]handleroptions.ServiceNameAndDefaults{
+							{
+								ServiceName: handleroptions.M3DBServiceName,
+								Defaults: []handleroptions.ServiceOptionsDefault{
+									handleroptions.WithDefaultServiceEnvironment(envCfgCluster.Service.Env),
+									handleroptions.WithDefaultServiceZone(envCfgCluster.Service.Zone),
+								},
 							},
 						},
-					},
-					iOpts)
-				if err != nil {
-					logger.Error("unable to create debug writer", zap.Error(err))
+						iOpts)
+					if err != nil {
+						logger.Error("unable to create debug writer", zap.Error(err))
+					}
 				}
 			}
 		}