Merge branch 'sh-drop-unmigrated-data-check' into 'master'

Drop legacy unmigrated data checks

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7207

Merged-by: Robert Marshall <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Reviewed-by: Robert Marshall <[email protected]>
Co-authored-by: Stan Hu <[email protected]>

Author: Robert Marshall

config/templates/package-scripts/preinst.erb

@@ -9,7 +9,6 @@ mkdir -p /var/log/gitlab/reconfigure
 
 skip_backup_file=/etc/gitlab/skip-auto-backup
 skip_reconfigure_file=/etc/gitlab/skip-auto-reconfigure
-skip_unmigrated_data_check=/etc/gitlab/skip-unmigrated-data-check
 
 # environment may contain these - clear them out
 OLD_VERSION_STRING=""
@@ -87,48 +86,6 @@ pg_check() {
   fi
 }
 
-unmigrated_data_check() {
-  if [ -e "${skip_unmigrated_data_check}" ] ; then
-    # The user wants us to do nothing
-    return
-  fi
-
-  if ( [ ! -d ${DEST_DIR}/service/puma ] && [ ! -d ${DEST_DIR}/service/sidekiq ] ); then
-    notify
-    notify "This node does not appear to be running puma and/or sidekiq services"
-    notify "Skipping unmigrated data check, if you think this is an error exit now"
-    notify
-    return
-  fi
-
-  notify "Checking for unmigrated data on legacy storage"
-  output=$(gitlab-rake gitlab:storage:legacy_attachments gitlab:storage:legacy_projects 2>&1);
-
-  if [ $? -ne 0 ]; then
-    notify
-    notify "Upgrade failed. Could not check for unmigrated data on legacy storage."
-    notify
-    notify "${output}"
-    unmigrated_data_check_failed
-  fi
-
-  if ! (echo $output | grep 'Found 0 attachments' && echo $output | grep 'Found 0 projects') > /dev/null 2>&1; then
-    notify
-    notify "Legacy storage is no longer supported. Please migrate your data to hashed storage."
-    notify "Check https://docs.gitlab.com/ee/administration/raketasks/storage.html#migrate-to-hashed-storage for details."
-    unmigrated_data_check_failed
-  fi
-}
-
-unmigrated_data_check_failed() {
-  notify
-  notify "If you want to skip this check, run the following command and try again:"
-  notify
-  notify " sudo touch ${skip_unmigrated_data_check}"
-  notify
-  exit 1
-}
-
 main() {
   if [ -e "${skip_reconfigure_file}" ] ; then
     # The user wants us to do nothing
@@ -174,15 +131,13 @@ case "$1" in
     upgrade_check
     config_check
     pg_check
-    unmigrated_data_check
     main
     ;;
   upgrade)
     # Looks like a DEB upgrade
     upgrade_check
     config_check
     pg_check
-    unmigrated_data_check
     main
     ;;
   *)

docker/assets/wrapper

@@ -44,38 +44,6 @@ function detect_unclean_start() {
     set -e
 }
 
-# Make sure that there is no unmigrated data to hashed storage.
-function unmigrated_data_check() {
-    set +e
-
-    echo "Checking for unmigrated data on legacy storage"
-    found=$(MAX_DATABASE_CONNECTION_CHECKS=5 gitlab-rake gitlab:storage:legacy_attachments gitlab:storage:legacy_projects 2>&1);
-
-    if [ $? -ne 0 ]; then
-        echo "Upgrade failed. Could not check for unmigrated data on legacy storage."
-        echo ""
-        echo $found
-        echo ""
-        echo ""
-        echo "If you would like to restart the instance without performing this"
-        echo "check, add the following to your docker command:"
-        echo "-e GITLAB_SKIP_UNMIGRATED_DATA_CHECK=true"
-        echo ""
-        exit 1
-    fi
-
-    if ! (echo $found | grep 'Found 0 attachments' && echo $found | grep 'Found 0 projects') > /dev/null 2>&1; then
-        echo
-        echo "Legacy storage is no longer supported. Please migrate your data to hashed storage."
-        echo "Check https://docs.gitlab.com/ee/administration/raketasks/storage.html#migrate-to-hashed-storage for details."
-        echo ""
-        echo "Upgrade failed. Retry the upgrade after migrating your data to hashed storage."
-        exit 1
-    fi
-
-    set -e
-}
-
 trap "sigterm_handler; exit" TERM
 
 source /RELEASE
@@ -179,21 +147,6 @@ GITLAB_OMNIBUS_CONFIG= /opt/gitlab/embedded/bin/runsvdir-start &
 echo "Configuring GitLab..."
 gitlab-ctl reconfigure
 
-# Skip unmigrated data check if Puma and Sidekiq is not running
-if [ ! -d /opt/gitlab/service/puma ] && [ ! -d /opt/gitlab/service/sidekiq ]; then
-    echo
-    echo "This node does not appear to be running puma and/or sidekiq services"
-    echo "Skipping unmigrated data check, if you think this is an error exit now"
-    echo
-
-    GITLAB_SKIP_UNMIGRATED_DATA_CHECK='true'
-fi
-
-# Check if there are no unmigrated data to hashed storage if it is an upgrade
-if [ "${GITLAB_UPGRADE}" == 'true' -a "${GITLAB_SKIP_UNMIGRATED_DATA_CHECK}" != 'true' ]; then
-  unmigrated_data_check
-fi
-
 # This must be false when the opt-in PostgreSQL version is the default for pg-upgrade,
 # otherwise it must be true.
 ATTEMPT_AUTO_PG_UPGRADE='false'