[Bugfix] Skip Collection check for missing Database (#1361)

Author: ajanikow

CHANGELOG.md

@@ -5,6 +5,7 @@
 - (Feature) Add Feature dependency
 - (Feature) Run secured containers as a feature
 - (Feature) Expose core.PodSecurityContext Sysctl options
+- (Bugfix) Skip Collection check for missing Database
 
 ## [1.2.31](https://github.com/arangodb/kube-arangodb/tree/1.2.31) (2023-07-14)
 - (Improvement) Block traffic on the services if there is more than 1 active leader in ActiveFailover mode

pkg/deployment/agency/state/generator_database_test.go

@@ -66,6 +66,11 @@ func (d databaseGenerator) Collection(name string) CollectionGeneratorInterface
 
 func (d databaseGenerator) Add() Generator {
 	return func(t *testing.T, s *State) {
+		if s.Plan.Databases == nil {
+			s.Plan.Databases = map[string]PlanDatabase{}
+		}
+		s.Plan.Databases[d.db] = PlanDatabase{}
+
 		if s.Plan.Collections == nil {
 			s.Plan.Collections = PlanCollections{}
 		}

pkg/deployment/agency/state/state.go

@@ -276,6 +276,11 @@ func GetDBServerBlockingRestartShards(s State, serverID Server) CollectionShardD
 func FilterDBServerShardRestart(serverID Server) ShardFilter {
 	return NegateFilter(func(s State, db, col, shard string) bool {
 		// Filter all shards which are not blocking restart of server
+		if _, ok := s.Plan.Databases[db]; !ok {
+			// DB Is missing, restart possible
+			return true
+		}
+
 		plan := s.Plan.Collections[db][col]
 		planShard := plan.Shards[shard]
 

pkg/deployment/agency/state/state_test.go

@@ -316,3 +316,60 @@ func Test_GetCollectionDatabaseByID(t *testing.T) {
 	require.False(t, ok)
 	require.Equal(t, "", v)
 }
+
+func Test_MissingDatabaseCase(t *testing.T) {
+	s := State{
+		Plan: Plan{
+			Collections: map[string]PlanDBCollections{
+				"_system": {
+					"10013": {
+						Shards: map[string]Servers{
+							"s10024": {
+								"PRMR-1e4bxazq",
+								"PRMR-rpkgdy5h",
+							},
+						},
+					},
+				},
+				"_test": {
+					"100131": {
+						Shards: map[string]Servers{
+							"s100241": {
+								"PRMR-1e4bxazq",
+								"PRMR-rpkgdy5h",
+							},
+						},
+					},
+				},
+			},
+			Databases: map[string]PlanDatabase{
+				"_system": {},
+			},
+		},
+		Current: Current{
+			Collections: map[string]CurrentDBCollections{
+				"_system": {
+					"10013": {
+						"s10024": {
+							Servers: Servers{
+								"PRMR-1e4bxazq",
+								"PRMR-rpkgdy5h",
+							},
+						},
+					},
+				},
+				"_test": {
+					"100131": {
+						"s100241": {
+							Servers: Servers{
+								"PRMR-1e4bxazq",
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	require.Len(t, GetDBServerBlockingRestartShards(s, "PRMR-1e4bxazq"), 0)
+}