rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-hostname-rename | 27 +++++++++++++++++++--------
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 24 insertions(+), 10 deletions(-)
New commits:
commit 03ace9f16f3c68a1191f88057a912fa6dc0dab4c
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Aug 6 12:53:09 2013 +0200
Automatic commit of package [spacewalk-utils] release [2.1.4-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 415dbea..1011483 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.1.3-1 utils/
+2.1.4-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 19d0292..a14a602 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.3
+Version: 2.1.4
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Tue Aug 06 2013 Jan Dobes 2.1.4-1
+- 972626 - multiple tries if db will not start quick enough
+
* Mon Aug 05 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.3-1
- 993254 - Script to enable us to purge audit-log tables
commit 16363d4fdce1a9712c998b25aa17c4134c4b7a27
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Aug 6 10:44:40 2013 +0200
972626 - multiple tries if db will not start quick enough
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index 455062c..eddb4bc 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -439,14 +439,25 @@ then
fi
fi
-SQL_RET=$(
-echo "$DBSHELL_QUIET
-select 0 from dual;
-$DBSHELL_QUIT
-" | spacewalk-sql --select-mode -
-)
-# SQL_RET="${SQL_RET#"${SQL_RET%%[![:space:]]*}"}"
-print_status "${SQL_RET}" "Your database isn't running."
+DB_MAX_TRIES=3;
+
+for (( i=1;;i++ )) do
+ SQL_RET=$(
+ echo "$DBSHELL_QUIET
+ select 0 from dual;
+ $DBSHELL_QUIT
+ " | spacewalk-sql --select-mode -
+ )
+ SQL_RET="${SQL_RET#"${SQL_RET%%[![:space:]]*}"}" # remove spaces
+ if [ "$SQL_RET" != "0" ] && [ $i -lt $DB_MAX_TRIES ]
+ then
+ echo_err "Your database isn't running. Trying again..."
+ sleep 3
+ else
+ print_status "${SQL_RET}" "Your database isn't running."
+ break # if success
+ fi
+done
echo -n "Updating /etc/rhn/rhn.conf ... " | tee -a $LOG
update_rhn_conf
Show replies by date