fix: delete engine files only but not the path itself (#549)

alespour · web-flow · commit 36c56521d302 · 2021-11-16T12:44:17.000-05:00
diff --git a/influxdb/2.0/alpine/entrypoint.sh b/influxdb/2.0/alpine/entrypoint.sh
@@ -102,7 +102,7 @@ function ensure_init_vars_set () {
 # the DB is already full set up.
 function cleanup_influxd () {
     log warn "cleaning bolt and engine files to prevent conflicts on retry" bolt_path "${BOLT_PATH}" engine_path "${ENGINE_PATH}"
-    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}"
+    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}/"*
 }
 
 # Upgrade V1 data into the V2 format using influxd upgrade.
diff --git a/influxdb/2.0/entrypoint.sh b/influxdb/2.0/entrypoint.sh
@@ -102,7 +102,7 @@ function ensure_init_vars_set () {
 # the DB is already full set up.
 function cleanup_influxd () {
     log warn "cleaning bolt and engine files to prevent conflicts on retry" bolt_path "${BOLT_PATH}" engine_path "${ENGINE_PATH}"
-    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}"
+    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}/"*
 }
 
 # Upgrade V1 data into the V2 format using influxd upgrade.
diff --git a/influxdb/2.1/alpine/entrypoint.sh b/influxdb/2.1/alpine/entrypoint.sh
@@ -102,7 +102,7 @@ function ensure_init_vars_set () {
 # the DB is already full set up.
 function cleanup_influxd () {
     log warn "cleaning bolt and engine files to prevent conflicts on retry" bolt_path "${BOLT_PATH}" engine_path "${ENGINE_PATH}"
-    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}"
+    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}/"*
 }
 
 # Upgrade V1 data into the V2 format using influxd upgrade.
diff --git a/influxdb/2.1/entrypoint.sh b/influxdb/2.1/entrypoint.sh
@@ -102,7 +102,7 @@ function ensure_init_vars_set () {
 # the DB is already full set up.
 function cleanup_influxd () {
     log warn "cleaning bolt and engine files to prevent conflicts on retry" bolt_path "${BOLT_PATH}" engine_path "${ENGINE_PATH}"
-    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}"
+    rm -rf "${BOLT_PATH}" "${ENGINE_PATH}/"*
 }
 
 # Upgrade V1 data into the V2 format using influxd upgrade.

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ function ensure_init_vars_set () {`
`102`	`102`	`# the DB is already full set up.`
`103`	`103`	`function cleanup_influxd () {`
`104`	`104`	`log warn "cleaning bolt and engine files to prevent conflicts on retry" bolt_path "${BOLT_PATH}" engine_path "${ENGINE_PATH}"`
`105`		`- rm -rf "${BOLT_PATH}" "${ENGINE_PATH}"`
	`105`	`+ rm -rf "${BOLT_PATH}" "${ENGINE_PATH}/"*`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`# Upgrade V1 data into the V2 format using influxd upgrade.`