You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2018/10/09 21:17:46 UTC
hadoop git commit: HDDS-564. Update docker-hadoop-runner branch to
reflect changes done in HDDS-490. Contributed by Namit Maheshwari.
Repository: hadoop
Updated Branches:
refs/heads/docker-hadoop-runner 08d7a0f28 -> ff717b6c8
HDDS-564. Update docker-hadoop-runner branch to reflect changes done in HDDS-490. Contributed by Namit Maheshwari.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ff717b6c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ff717b6c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ff717b6c
Branch: refs/heads/docker-hadoop-runner
Commit: ff717b6c8d22f0e1fb27c745cd283925e2dd601e
Parents: 08d7a0f
Author: Arpit Agarwal <ar...@apache.org>
Authored: Tue Oct 9 14:17:17 2018 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Tue Oct 9 14:17:17 2018 -0700
----------------------------------------------------------------------
scripts/starter.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff717b6c/scripts/starter.sh
----------------------------------------------------------------------
diff --git a/scripts/starter.sh b/scripts/starter.sh
index 047791b..cc6d25c5 100755
--- a/scripts/starter.sh
+++ b/scripts/starter.sh
@@ -80,7 +80,8 @@ fi
if [ -n "$ENSURE_SCM_INITIALIZED" ]; then
if [ ! -f "$ENSURE_SCM_INITIALIZED" ]; then
- /opt/hadoop/bin/ozone scm -init
+ # Improve om and scm start up options
+ /opt/hadoop/bin/ozone scm --init || /opt/hadoop/bin/ozone scm -init
fi
fi
@@ -91,7 +92,8 @@ if [ -n "$ENSURE_OM_INITIALIZED" ]; then
# Could be removed after HDFS-13203
echo "Waiting 15 seconds for SCM startup"
sleep 15
- /opt/hadoop/bin/ozone om -createObjectStore
+ # Improve om and scm start up options
+ /opt/hadoop/bin/ozone om --init || /opt/hadoop/bin/ozone om -createObjectStore
fi
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org