Merge branch 'release/2.4.7'

brainupdaters · Nov 15, 2022 · b390cf4 · b390cf4
2 parents fc62978 + 9314a1b
commit b390cf4
Show file tree

Hide file tree

Showing 28 changed files with 404 additions and 134 deletions.
diff --git a/doc/drlm-release-notes.rst b/doc/drlm-release-notes.rst
@@ -64,6 +64,23 @@ DRLM are compatible with previous versions, unless otherwise noted.
 
 The references pointing to fix #nr or issue #nr refer to our issues tracker
 
+DRLM Version 2.4.7 (November 2022) - Release Notes
+-------------------------------------------------
+  * Bugfix removing authorized keys
+
+  * Bugfix in installclient DRLM Proxy (hostname unreachable)
+
+  * Improved unsched client sql select 
+
+  * Changed default QEMU_NBD_OPTIONS
+
+  * Mutex race solved in nbd assignment
+
+  * Improved network, client, backup and job lists
+
+  * Bugfix in DRLM PROXY ReaR URL generation
+
+
 DRLM Version 2.4.6 (September 2022) - Release Notes
 ---------------------------------------------------
   * Bugfix in deb package update

diff --git a/etc/drlm/rsyncd/rsyncd.motd b/etc/drlm/rsyncd/rsyncd.motd
@@ -1 +1 @@
-DRLM server 2.4.6
+DRLM server 2.4.7
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,8 +1,21 @@
+drlm (2.4.7) stable release; urgency=high
+  * Bugfix removing authorized keys
+  * Bugfix in installclient DRLM Proxy (hostname unreachable)
+  * Improved unsched client sql select
+  * Changed default QEMU_NBD_OPTIONS
+  * Mutex race solved in nbd assignment
+  * Improved network, client, backup and job lists
+  * Bugfix in DRLM PROXY ReaR URL generation
+
+ -- Pau Roura <[email protected]>  Mon, 14 Nov 2022 00:00:00 +0100
+
 drlm (2.4.6) stable release; urgency=high
   * Bugfix in deb package update
 
  -- Pau Roura <[email protected]>  Wed, 21 Sep 2022 00:00:00 +0100
 
+ -- Pau Roura <[email protected]>  Wed, 21 Sep 2022 00:00:00 +0100
+
 drlm (2.4.5) stable release; urgency=high
   * NEW! Improved jobs list with status feedback
   * NEW! Now is possible to enable and disable Jobs

diff --git a/packaging/debian/drlm.dsc b/packaging/debian/drlm.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: drlm
-Version: 2.4.6
+Version: 2.4.7
 Binary: drlm
 Maintainer: Pau Roura ([email protected])
 Architecture: all

diff --git a/packaging/rpm/drlm.spec b/packaging/rpm/drlm.spec
@@ -10,7 +10,7 @@
 
 Summary: DRLM
 Name: drlm
-Version: 2.4.6
+Version: 2.4.7
 Release: 1%{?rpmrelease}%{?dist}
 License: GPLv3
 Group: Applications/File
@@ -316,6 +316,15 @@ systemctl start drlm-tftpd.service
 
 %changelog
 
+* Mon Nov 14 2022 Pau Roura <[email protected]> 2.4.7
+- Bugfix removing authorized keys.
+- Bugfix in installclient DRLM Proxy (hostname unreachable).
+- Improved unsched client sql select 
+- Changed default QEMU_NBD_OPTIONS
+- Mutex race solved in nbd assignment
+- Improved network, client, backup and job lists
+- Bugfix in DRLM PROXY ReaR URL generation
+
 * Wed Sep 21 2022 Pau Roura <[email protected]> 2.4.6
 - Bugfix in deb package update
 

diff --git a/usr/sbin/drlm b/usr/sbin/drlm
@@ -48,7 +48,7 @@ readonly INITIAL_BASH_FLAGS_AND_OPTIONS_COMMANDS="$( get_bash_flags_and_options_
 # Versioning
 readonly PRODUCT="Disaster Recovery Linux Manager"
 readonly PROGRAM=${0##*/}
-readonly VERSION=2.4.6
+readonly VERSION=2.4.7
 readonly RELEASE_DATE="Git"
 
 readonly STARTTIME=$SECONDS

diff --git a/usr/share/drlm/backup/imp/default/049_get_import_backup_configuration.sh b/usr/share/drlm/backup/imp/default/049_get_import_backup_configuration.sh
@@ -80,7 +80,7 @@ if [ -n "$BKP_SRC" ]; then
   mkdir $TMP_MOUNTPOINT &> /dev/null
   if [ $? -ne 0 ]; then Error "Error creating mountpoint directory $TMP_MOUNTPOINT"; fi
   # Get a free NBD device
-  NBD_DEVICE="$(get_free_nbd)"
+  NBD_DEVICE="$(get_free_nbd $$)"
   if [ $? -ne 0 ]; then Error "Error getting a free NBD"; fi
 
    # Attach DR file to a NBD

diff --git a/usr/share/drlm/backup/imp/default/109_enable_client_backup.sh b/usr/share/drlm/backup/imp/default/109_enable_client_backup.sh
@@ -12,7 +12,7 @@ if [ ! -d ${STORDIR}/${CLI_NAME}/${CLI_CFG} ]; then
 fi
 
 # Get next nbd device free
-local NBD_DEVICE="$(get_free_nbd)"
+local NBD_DEVICE="$(get_free_nbd $$)"
 
 Log "Enabling DR Backup Store $STORDIR/$CLI_NAME/$CLI_CFG (rw)"
 

diff --git a/usr/share/drlm/backup/mgr/default/109_enable_client_backup.sh b/usr/share/drlm/backup/mgr/default/109_enable_client_backup.sh
@@ -7,7 +7,7 @@ DR_FILE=$(get_backup_drfile_by_backup_id "$BKP_ID")
 if [ -n "$DR_FILE" ]; then
 
   # Get a free NBD device
-  NBD_DEVICE=$(get_free_nbd)
+  NBD_DEVICE=$(get_free_nbd $$)
 
   # If disable = "yes" and we are here, means that we have to disable this snap but not enable
   # for this reason SNAP_ID is set to empty value

diff --git a/usr/share/drlm/backup/run/default/079_create_enable_dr_img.sh b/usr/share/drlm/backup/run/default/079_create_enable_dr_img.sh
@@ -164,7 +164,7 @@ fi
 LogPrint "Enabling new DR store for client $CLI_NAME and $CLI_CFG"
 # Create nbd
 # Get next free nbd
-NBD_DEVICE=$(get_free_nbd)
+NBD_DEVICE=$(get_free_nbd $$)
 NBD_DEVICE_PART="${NBD_DEVICE}p1"
 
 # Attach DR file to a NBD

diff --git a/usr/share/drlm/client/inst/default/109_create_user_on_client.sh b/usr/share/drlm/client/inst/default/109_create_user_on_client.sh
@@ -10,11 +10,18 @@ else
   if [ $? -ne 0  ]; then  
     Error "ssh-copy-id failed!"
   else 
-    Log "Key succesfully copied to $CLI_NAME" 
+    Log "Key succesfully copied to $CLI_NAME"
+    AddExitTask "ssh_remove_authorized_keys  ${USER} ${CLI_NAME}"  
   fi
   REMOVE_SSH_ID="true"
 fi
 
+# The execution of the ssh_dsend_drlm_hostname function has been advanced 
+# from de last stages of instclient to the firsts so that the hostname of 
+# the server is available in case packages have to be installed through 
+# the DRLM Proxy
+if ssh_send_drlm_hostname ${USER} ${CLI_NAME} ${SRV_IP} ${SUDO}; then LogPrint "Success to update DRLM hostname info to ${CLI_NAME}"; else Error "Error updating DRLM hostname information, check logfile"; fi
+
 DISTRO=$(ssh_get_distro $USER $CLI_NAME)
 RELEASE=$(ssh_get_release $USER $CLI_NAME)
 CLI_VERSION=$(echo $RELEASE | cut -d "." -f 1)

diff --git a/usr/share/drlm/client/inst/default/359_install_client_soft.sh b/usr/share/drlm/client/inst/default/359_install_client_soft.sh
@@ -2,6 +2,17 @@
 
 if [ -z "$CONFIG_ONLY" ]; then
 
+    # Reevaluate URL_REAR variables if URL_REAR_BASE is defined in site.conf or local.conf
+    if grep "URL_REAR_BASE=" $CONFIG_DIR/site.conf > /dev/null 2>&1 || grep "URL_REAR_BASE=" $CONFIG_DIR/local.conf > /dev/null 2>&1; then
+      eval $(grep '="$URL_REAR_BASE' $SHARE_DIR/conf/default.conf)
+      if grep "^URL_REAR_" $CONFIG_DIR/site.conf > /dev/null 2>&1; then
+        eval $(grep "^URL_REAR_" $CONFIG_DIR/site.conf)
+      fi
+      if grep "^URL_REAR_" $CONFIG_DIR/local.conf > /dev/null 2>&1; then
+        eval $(grep "^URL_REAR_" $CONFIG_DIR/local.conf)
+      fi
+    fi
+
     if [ "$ARCH" == "x86_64" ]; then
       REP_ARCH="_64"
     elif [ "$ARCH" == "i686" ]; then

diff --git a/usr/share/drlm/client/inst/default/559_config_rear_sudo_cfg.sh b/usr/share/drlm/client/inst/default/559_config_rear_sudo_cfg.sh
@@ -10,10 +10,6 @@ if make_ssl_capath ${USER} ${CLI_NAME} ${SUDO}; then LogPrint "SSL CApath succes
 
 if send_ssl_cert ${USER} ${CLI_NAME} ${SUDO}; then LogPrint "SSL certificate successfully sent to ${CLI_NAME}"; else Error "Error sending certificate, check logfile"; fi
 
-if [ -n "$SRV_IP" ]; then
-  if ssh_send_drlm_hostname ${USER} ${CLI_NAME} ${SRV_IP} ${SUDO}; then LogPrint "Success to update DRLM hostname info to ${CLI_NAME}"; else Error "Error updating DRLM hostname information, check logfile"; fi
-fi
-
 if ssh_create_drlm_var ${USER} ${CLI_NAME} ${SUDO}; then LogPrint "Creating /var/lib/drlm in $CLI_NAME"; else Error "Error creating /var/lib/drlm in $CLI_NAME, check logfile"; fi
 
 PUBLIC_KEY=$(ssh_config_public_keys "${USER}" "${CLI_NAME}" "${SRV_IP}" "${SUDO}" )
@@ -27,7 +23,8 @@ if ssh_config_sudo ${USER} ${CLI_NAME} ${DRLM_USER} ${SUDO}; then LogPrint "Sudo
 # Delete root from authorized keys if they were created in this workflow
 if [ "$REMOVE_SSH_ID" == "true" ]; then
   if ssh_remove_authorized_keys  ${USER} ${CLI_NAME}; then 
-    LogPrint "${USER} authorized_keys removed from client ${CLI_NAME}" 
+    LogPrint "${USER} authorized_keys removed from client ${CLI_NAME}"
+    RemoveExitTask "ssh_remove_authorized_keys  ${USER} ${CLI_NAME}" 
   else 
     Error "Error removing ${USER} authorized_keys from client ${CLI_NAME}" 
   fi

diff --git a/usr/share/drlm/conf/default.conf b/usr/share/drlm/conf/default.conf
@@ -155,9 +155,10 @@ QCOW_VIRTUAL_SIZE="10T"
 
 ################ ---- QEMU-NBD OPTIONS
 #
+# QEMU_NBD_OPTIONS="--cache=none --aio=native"
 ########
 
-QEMU_NBD_OPTIONS="--cache=none --aio=native"
+QEMU_NBD_OPTIONS="--cache=none"
 
 
 ################ ---- DRLM DATA BACKEND TYPES

diff --git a/usr/share/drlm/conf/samples/client_PXE.cfg b/usr/share/drlm/conf/samples/client_PXE.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.6
+# DRLM v2.4.7
 # 
 
 # This configuration example does a PXE rescue system and a data backup of all 

diff --git a/usr/share/drlm/conf/samples/client_data_only.cfg b/usr/share/drlm/conf/samples/client_data_only.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.6
+# DRLM v2.4.7
 # 
 
 # This configuration example does a data backup of /home directory of the 

diff --git a/usr/share/drlm/conf/samples/client_default.cfg b/usr/share/drlm/conf/samples/client_default.cfg
@@ -8,7 +8,7 @@
 #         (Configuration examples in /usr/share/drlm/conf/samples/)           #
 ###############################################################################
 
-# DRLM v2.4.6
+# DRLM v2.4.7
 #
 
 # DRLM automatically generates a ReaR configuration file in function of three

diff --git a/usr/share/drlm/conf/samples/client_default.drlm.cfg b/usr/share/drlm/conf/samples/client_default.drlm.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.6
+# DRLM v2.4.7
 #
 
 # In client.drlm.cfg config file can be set DRLM client specific configurations

diff --git a/usr/share/drlm/conf/samples/client_incremental.cfg b/usr/share/drlm/conf/samples/client_incremental.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.6
+# DRLM v2.4.7
 # 
 
 # This configuration example does ISO rescue file and an incremental  data 

diff --git a/usr/share/drlm/conf/samples/client_incremental_data_only.cfg b/usr/share/drlm/conf/samples/client_incremental_data_only.cfg
@@ -6,7 +6,7 @@
 # for more information.                                                       #
 ###############################################################################
 
-# DRLM v2.4.6
+# DRLM v2.4.7
 # 
 
 # This configuration example does a data backup of /home directory of the 

diff --git a/usr/share/drlm/job/list/default/059_list_registered_jobs.sh b/usr/share/drlm/job/list/default/059_list_registered_jobs.sh
@@ -4,18 +4,18 @@ if [ -z "$JOB_ID" ]; then
   if [ -n "$CLI_NAME" ]; then
     if ! exist_client_name "$CLI_NAME"; then
       if [ "$CLI_NAME" == "all" ]; then 
-        list_job_all
+        list_job
       else
         printf '%25s\n' "$(tput bold)$CLI_NAME$(tput sgr0) not found in database!!"	
       fi
     else
       CLI_ID=$(get_client_id_by_name $CLI_NAME)
-      list_job_all $CLI_ID
+      list_job $CLI_ID
     fi
   fi
 else
   if exist_job_id "$JOB_ID"; then
-    list_job $JOB_ID
+    list_job $JOB_ID "job"
   else
     printf '%25s\n' "$(tput bold)$JOB_ID$(tput sgr0) not found in database!!"
   fi