Merge pull request grafana#1341 from nrjpoddar/fixTableDeletes

Updated table deletes to ignore empty prefixes
cyriltovena · Apr 29, 2019 · ad04709 · ad04709
2 parents dca32de + bbc7ce3
commit ad04709
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/table_manager.go b/table_manager.go
@@ -333,8 +333,12 @@ func (m *TableManager) partitionTables(ctx context.Context, descriptions []Table
 		// Ensure we only delete tables which have a prefix managed by Cortex.
 		tablePrefixes := map[string]struct{}{}
 		for _, cfg := range m.schemaCfg.Configs {
-			tablePrefixes[cfg.IndexTables.Prefix] = struct{}{}
-			tablePrefixes[cfg.ChunkTables.Prefix] = struct{}{}
+			if cfg.IndexTables.Prefix != "" {
+				tablePrefixes[cfg.IndexTables.Prefix] = struct{}{}
+			}
+			if cfg.ChunkTables.Prefix != "" {
+				tablePrefixes[cfg.ChunkTables.Prefix] = struct{}{}
+			}
 		}
 
 		for existingTable := range existingTables {