From 055e556e67624ca4aeddd6675f0fafbfbfeded9b Mon Sep 17 00:00:00 2001
From: Xiaoyu Yao <xyao@apache.org>
Date: Sun, 14 May 2017 06:12:19 -0700
Subject: [PATCH] HDFS-11815. CBlockManager#main should join() after start()
 service. Contributed by Chen Liang.

---
 .../src/main/java/org/apache/hadoop/cblock/CBlockManager.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockManager.java
index 4095530358b..30563c3434c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/cblock/CBlockManager.java
@@ -363,5 +363,6 @@ public class CBlockManager implements CBlockServiceProtocol,
         client, new XceiverClientManager(ozoneConf));
     CBlockManager cbm = new CBlockManager(ozoneConf, storageClient);
     cbm.start();
+    cbm.join();
   }
 }