feat: test backup directory is writable to avoid chown (apache#537)

intershop · Apr 4, 2023 · 1071393 · 1071393
1 parent c16b34e
commit 1071393
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go
@@ -618,6 +618,7 @@ func generateSolrSetupInitContainers(solrCloud *solr.SolrCloud, solrCloudStatus
 		},
 	}
 	setupCommands := []string{"cp /tmp/solr.xml /tmp-config/solr.xml"}
+	setupCommands = append(setupCommands, fmt.Sprintf("adduser -u %d -H -D solr", DefaultSolrUser))
 
 	// Add prep for backup-restore Repositories
 	// This entails setting the correct permissions for the directory
@@ -627,7 +628,8 @@ func generateSolrSetupInitContainers(solrCloud *solr.SolrCloud, solrCloudStatus
 				volumeMounts = append(volumeMounts, *volumeMount)
 
 				setupCommands = append(setupCommands, fmt.Sprintf(
-					"chown -R %d:%d %s",
+					"(su solr -c 'test -w %s' || chown -R %d:%d %s)",
+					volumeMount.MountPath,
 					DefaultSolrUser,
 					DefaultSolrGroup,
 					volumeMount.MountPath))