revert changes to packaging, so that PR can be landed

arangodb · jsteemann · Feb 3, 2020 · Jan 21, 2020 · Jan 22, 2020 · Jan 22, 2020
commit 5e39b771417a6a172050b20c0bdca60d1e61ce93
diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh.in b/Installation/MacOSX/Bundle/arangodb-cli.sh.in
@@ -82,11 +82,26 @@ EOF
   fi
 fi
 
-if test -f "${HOME}@INC_CPACK_ARANGO_DATA_DIR@/SERVER" -a -f "${HOME}@INC_CPACK_ARANGO_DATA_DIR@/ENGINE"; then
-    rm -f "${HOME}@INC_CPACK_ARANGO_DATA_DIR@/LOCK" # FIXME
+if test ! -f "${HOME}@INC_CPACK_ARANGO_DATA_DIR@/SERVER" -a ! -f "${HOME}@INC_CPACK_ARANGO_DATA_DIR@/ENGINE"; then
+    STORAGE_ENGINE=$(
+        /usr/bin/osascript <<-EOF
+set issueList to {"auto", "rocksdb", "mmfiles"}
+set selectedIssue to {choose from list issueList}
+return selectedIssue
+EOF
+                  )
+
+    if test "$STORAGE_ENGINE" == "false"; then
+        STORAGE_ENGINE=auto
+    fi
+
+    sed -i -e "s;storage-engine = auto;storage-engine = $STORAGE_ENGINE;" "${ARANGOD_CONF}"
+else
     if "${ROOTDIR}/arangod" -c "${ARANGOD_CONF}" --database.check-version true; then
+        rm -f "${HOME}@INC_CPACK_ARANGO_DATA_DIR@/LOCK" # FIXME
         echo "database doesn't need an upgrade."
     else
+        rm -f "${HOME}@INC_CPACK_ARANGO_DATA_DIR@/LOCK" # FIXME
         UPGRADE_DB=$(/usr/bin/osascript<<END
 tell application "System Events"
 activate

diff --git a/Installation/Windows/Templates/NSIS.template.in b/Installation/Windows/Templates/NSIS.template.in
@@ -48,6 +48,7 @@ Var START_MENU
 Var ADD_DESKTOP_ICON           ; x bool: add desktop icon
 Var IS_DEFAULT_INSTALLDIR
 
+Var STORAGE_ENGINE            ; x string auto/mmfiles/rocksdb
 Var PASSWORD                  ; x string
 Var PASSWORD_AGAIN            ; x string / only for comparison
 
@@ -661,6 +662,7 @@ continueUI:
       MessageBox MB_ICONEXCLAMATION "Please clean up the previously existing incomplete database directory $\r$\n$DATADIR$\r$\n before continuing with the installation!"
     startDialog:
   ${Else}
+    StrCpy $STORAGE_ENGINE "auto"
     Return
   ${EndIf}
   nsDialogs::Create 1018
@@ -683,6 +685,16 @@ continueUI:
   ${NSD_CreateLabel} 35% 50 40% 6% "Password (Again)"
   Pop $0 ; Don't care...
 
+  ${NSD_CreateLabel} 0, 90, 100% 6% "Choose the storage engine to use for this ArangoDB installation"
+  Pop $0 ; Don't care...
+
+  ${NSD_CreateDropList} 5, 110, 30% 6% ""
+  Pop $DLG2_droplist
+  ${NSD_CB_AddString} $DLG2_droplist "auto"
+  ${NSD_CB_AddString} $DLG2_droplist "mmfiles"
+  ${NSD_CB_AddString} $DLG2_droplist "rocksdb"
+
+  ${NSD_CB_SelectString} $DLG2_droplist "auto"
   nsDialogs::Show
 
   Return
@@ -696,6 +708,7 @@ Function InstallOptionsPage2_results
   Push $R0
   Push $R1
   Push $R2
+  ${NSD_GetText} $DLG2_droplist $STORAGE_ENGINE
 
   ${NSD_GetText} $Dlg2_PW_2 $PASSWORD_AGAIN
   ${NSD_GetText} $Dlg2_PW_1 $PASSWORD
@@ -952,7 +965,7 @@ Section "-Core installation"
   ${If} $LOGDIR != ""
     StrCpy $ini_LOGFILE "[log]$\r$\nfile = $LOGDIR\arangod.log$\r$\n"
   ${EndIf}
-  StrCpy $newCfgValues "$ini_APPDIR$ini_DATADIR$ini_LOGFILE"
+  StrCpy $newCfgValues "$ini_APPDIR$ini_DATADIR$ini_LOGFILE[server]$\r$\nstorage-engine = $STORAGE_ENGINE$\r$\n"
   ${AnsiToUtf8} $newCfgValues $newCfgValuesUtf8
   StrCpy $newCfgValuesFile "$INSTDIR\etc\arangodb3\newValues.ini"
   FileOpen $4  "$newCfgValuesFile" w
@@ -1300,6 +1313,12 @@ noInstDir:
   IfErrors +2 0
   StrCpy $DATADIR "$CMDINSTDIR"
 
+  ${GetParameters} $R0
+  ClearErrors
+  ${GetOptions} $R0 "/STORAGE_ENGINE=" $STORAGE_ENGINE
+  IfErrors 0 +2
+  StrCpy $STORAGE_ENGINE "auto"
+
   ${GetParameters} $R0
   ${GetOptions} $R0 "/DESKTOPICON="    $ADD_DESKTOP_ICON
   IfErrors 0 +2

diff --git a/Installation/debian/config.in b/Installation/debian/config.in
@@ -29,7 +29,7 @@ fi
 #do the actual configure
 if test "$DO_CONFIGURE" = "yes"; then
     STATE=1
-    LASTSTATE=4
+    LASTSTATE=5
     while test "$STATE" -ne 0 -a \
                "$STATE" -le "$LASTSTATE" ; do
 
@@ -56,6 +56,10 @@ if test "$DO_CONFIGURE" = "yes"; then
                 db_input high @CPACK_PACKAGE_NAME@/upgrade || true
             ;;
             4)
+                db_input high @CPACK_PACKAGE_NAME@/storage_engine || true
+                db_go
+            ;;
+            5)
                 db_get @CPACK_PACKAGE_NAME@/upgrade
                 if [ "$RET" = "true" ]; then
                     db_input high @CPACK_PACKAGE_NAME@/backup || true

diff --git a/Installation/debian/postinst.in b/Installation/debian/postinst.in
@@ -10,6 +10,8 @@ ARANGODB="/usr/sbin/arangod"
 . /usr/share/debconf/confmodule
 . /usr/share/arangodb3/arangodb-helper
 
+db_get @CPACK_PACKAGE_NAME@/storage_engine
+STORAGE_ENGINE=$RET
 export GLIBCXX_FORCE_NEW=1
 
 current=/var/tmp/arangod
@@ -20,6 +22,8 @@ if test -d /var/lib/arangodb3 -a ! -f /usr/sbin/arangod; then
 else
     NEW_INSTALL_EXISTING_DIR=false
 fi
+#fill in correct storage engine into arangod.conf
+sed -i /etc/arangodb3/arangod.conf -e "s;storage-engine = auto;storage-engine = $STORAGE_ENGINE;"
 
 if test "@CPACK_SYSTEMD_FOUND@" -eq 1 ; then
     if deb-systemd-invoke is-active @CPACK_PACKAGE_NAME@.service 2>&1 >/dev/null ; then

diff --git a/Installation/debian/templates.in b/Installation/debian/templates.in
@@ -32,3 +32,14 @@ Type: error
 Description: Password input error
  The two passwords you entered were not the same. Please try again.
 
+Template: @CPACK_PACKAGE_NAME@/storage_engine
+Type: select
+Choices: auto, mmfiles, rocksdb
+Default: auto
+Description: Database storage engine
+ Choose which storage engine you want to use.
+ Please note that you can't switch storage engines of existing installations,
+ a dump and restore is required therefore.
+
+ 'auto' will pick the existing one or default to rocksdb.
+
diff --git a/Installation/rpm/arangodb.spec.in b/Installation/rpm/arangodb.spec.in
@@ -232,6 +232,9 @@ First Steps with ArangoDB:
 Upgrading ArangoDB:
   https://www.arangodb.com/docs/stable/upgrading.html
 
+Configuring the storage Engine:
+  https://www.arangodb.com/docs/stable/programs-arangod-server.html#storage-engine
+
 Upgrading ArangoDB database files:
   > /etc/init.d/arangodb3 upgrade