HBASE-22376 master can fail to start w/NPE if lastflushedseqids file …

…is empty Signed-off-by: Peter Somogyi <[email protected]>
Zohar163 · May 10, 2019 · 3641e7a · 3641e7a
1 parent 420fbba
commit 3641e7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1007,7 +1007,7 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
     try {
       this.serverManager.loadLastFlushedSequenceIds();
     } catch (IOException e) {
-      LOG.debug("Failed to load last flushed sequence id of regions"
+      LOG.info("Failed to load last flushed sequence id of regions"
           + " from file system", e);
     }
     // Set ourselves as active Master now our claim has succeeded up in zk.

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
@@ -1126,6 +1126,10 @@ public void loadLastFlushedSequenceIds() throws IOException {
     try {
       FlushedSequenceId flushedSequenceId =
           FlushedSequenceId.parseDelimitedFrom(in);
+      if (flushedSequenceId == null) {
+        LOG.info(".lastflushedseqids found at {} is empty", lastFlushedSeqIdPath);
+        return;
+      }
       for (FlushedRegionSequenceId flushedRegionSequenceId : flushedSequenceId
           .getRegionSequenceIdList()) {
         byte[] encodedRegionName = flushedRegionSequenceId