diff options
| -rwxr-xr-x | configserver/src/main/sh/vespa-configserver-remove-state | 11 | ||||
| -rwxr-xr-x | vespabase/src/rhel-prestart.sh | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state index 404f0f89a53..c781fcb0c0d 100755 --- a/configserver/src/main/sh/vespa-configserver-remove-state +++ b/configserver/src/main/sh/vespa-configserver-remove-state @@ -75,14 +75,12 @@ usage() { sudo="sudo" ask=true remove_zookeeper_dir=true -remove_applications_dir=true remove_tenants_dir=true confirmed=true zookeeper_dir=var/zookeeper -applications_dir=var/db/vespa/config_server/serverdb/applications tenants_dir=var/db/vespa/config_server/serverdb/tenants -if [ -w $applications_dir ] && [ -w $zookeeper_dir ]; then +if [ -w $zookeeper_dir ]; then sudo="" fi @@ -123,9 +121,8 @@ confirm() { } garbage_collect_dirs() { - find $zookeeper_dir $applications_dir -type d -depth 2>/dev/null | while read dir; do + find $zookeeper_dir $tenants_dir -type d -depth 2>/dev/null | while read dir; do [ "$dir" = "$zookeeper_dir" ] && continue - [ "$dir" = "$applications_dir" ] && continue $sudo rmdir "$dir" 2>/dev/null done } @@ -148,10 +145,6 @@ if $remove_zookeeper_dir && [ -d $zookeeper_dir ]; then confirm_and_clean_dir $zookeeper_dir fi -if $remove_applications_dir && [ -d $applications_dir ]; then - confirm_and_clean_dir $applications_dir -fi - if $remove_tenants_dir && [ -d $tenants_dir ]; then confirm_and_clean_dir $tenants_dir fi diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 89be9fec2be..fa7b9a1fe49 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -89,12 +89,11 @@ fixdir ${VESPA_USER} wheel 755 libexec/vespa/plugins/qrs fixdir ${VESPA_USER} wheel 755 logs/vespa/configserver fixdir ${VESPA_USER} wheel 755 logs/vespa/qrs fixdir ${VESPA_USER} wheel 755 logs/vespa/search -fixdir ${VESPA_USER} wheel 755 var/cache/vespa/config fixdir ${VESPA_USER} wheel 755 var/db/vespa fixdir ${VESPA_USER} wheel 755 var/db/vespa/tmp fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb -fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb/applications +fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb/tenants fixdir ${VESPA_USER} wheel 755 var/db/vespa/index fixdir ${VESPA_USER} wheel 755 var/db/vespa/logcontrol fixdir ${VESPA_USER} wheel 755 var/db/vespa/search @@ -102,7 +101,6 @@ fixdir ${VESPA_USER} wheel 755 var/jdisc_core fixdir ${VESPA_USER} wheel 755 var/vespa/bundlecache fixdir ${VESPA_USER} wheel 755 var/vespa/bundlecache/configserver fixdir ${VESPA_USER} wheel 755 var/vespa/cache/config/ -fixdir ${VESPA_USER} wheel 775 libexec/vespa/modelplugins chown -hR ${VESPA_USER} logs/vespa chown -hR ${VESPA_USER} var/db/vespa |