HDDS-189. Update HDDS to start OzoneManager. Contributed by Arpit Agarwal.

README.md

@@ -29,10 +29,21 @@ docker build -t apache/hadoop-runner .
 
 ## Usage
 
-Do a full build on the HDFS-7240 branch of apache hadoop repositry
+Do a full build on Apache Hadoop trunk with the `hdds` profile enabled.
+```
+mvn clean install package -DskipTests -Pdist,hdds -Dtar -Dmaven.javadoc.skip=true
+```
+
+Then start HDDS services with `docker-compose`.
 
 ```
-cd dev-support/compose/ozone
+cd hadoop-dist/target/compose/ozone
 docker-compose up -d
 ```
 
+## Troubleshooting
+
+If `docker-compose` fails to work, check that the `hadoop-dist/target/compose/ozone/.env` file exists and has a line like the following (the exact version number may be different):
+```
+    HDDS_VERSION=0.2.1-SNAPSHOT
+```

scripts/starter.sh

@@ -55,12 +55,27 @@ if [ -n "$ENSURE_SCM_INITIALIZED" ]; then
    fi
 fi
 
+
+if [ -n "$ENSURE_OM_INITIALIZED" ]; then
+   if [ ! -f "$ENSURE_OM_INITIALIZED" ]; then
+      # To make sure SCM is running in dockerized environment we will sleep
+      # Could be removed after HDFS-13203
+      echo "Waiting 15 seconds for SCM startup"
+      sleep 15
+      /opt/hadoop/bin/ozone om -createObjectStore
+   fi
+fi
+
+
+# The KSM initialization block will go away eventually once
+# we have completed renaming KSM to OzoneManager (OM).
+#
 if [ -n "$ENSURE_KSM_INITIALIZED" ]; then
    if [ ! -f "$ENSURE_KSM_INITIALIZED" ]; then
-      #To make sure SCM is running in dockerized environment we will sleep
-		# Could be removed after HDFS-13203
-		echo "Waiting 15 seconds for SCM startup"
-		sleep 15
+      # To make sure SCM is running in dockerized environment we will sleep
+      # Could be removed after HDFS-13203
+      echo "Waiting 15 seconds for SCM startup"
+      sleep 15
       /opt/hadoop/bin/ozone ksm -createObjectStore
    fi
 fi