From e6bde6114d243cc099b51f522b33e1f380bbf4b9 Mon Sep 17 00:00:00 2001
From: Roy Kim <sungwook0115.kim@gmail.com>
Date: Tue, 13 Oct 2020 00:21:19 +0900
Subject: [PATCH] [naver/pinpoint#7214] check last table in case interruption
 in table creation

---
 docker-compose.yml                          | 7 +++++++
 pinpoint-hbase/build/scripts/check-table.sh | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2c68177..2229afa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,6 +31,8 @@ services:
       - "60020:60020"
       - "16030:16030"
     restart: always
+    depends_on:
+      - zoo1
 
   pinpoint-mysql:
     build:
@@ -69,6 +71,7 @@ services:
     depends_on:
       - pinpoint-hbase
       - pinpoint-mysql
+      - zoo1
     restart: always
     expose:
       - "9997"
@@ -119,6 +122,7 @@ services:
 
     depends_on:
       - pinpoint-hbase
+      - zoo1
     restart: always
     expose:
       - "9991"
@@ -255,6 +259,8 @@ services:
       - JOB_MANAGER_RPC_ADDRESS=jobmanager
     networks:
       - pinpoint
+    depends_on:
+      - zoo1
 
   taskmanager:
     container_name: "${PINPOINT_FLINK_NAME}-taskmanager"
@@ -268,6 +274,7 @@ services:
       - "6122:6122"
       - "19994:19994"
     depends_on:
+      - zoo1
       - jobmanager
     command: taskmanager
     links:
diff --git a/pinpoint-hbase/build/scripts/check-table.sh b/pinpoint-hbase/build/scripts/check-table.sh
index 667a302..dde43f7 100644
--- a/pinpoint-hbase/build/scripts/check-table.sh
+++ b/pinpoint-hbase/build/scripts/check-table.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-if echo -e "exists 'AgentInfo'" | ${HBASE_HOME}/bin/hbase shell 2>&1 | grep -q "does exist" 2>/dev/null
+if echo -e "exists 'HostApplicationMap_Ver2'" | ${HBASE_HOME}/bin/hbase shell 2>&1 | grep -q "does exist" 2>/dev/null
 then 
     echo "Tables already exist"
-    break
 else
     sleep 15        
     echo "create tables"