From 8ada2559b7d5eb832907f1417283f4296fe540af Mon Sep 17 00:00:00 2001
From: Mingyu Chen <morningman.cmy@gmail.com>
Date: Mon, 8 Jun 2020 23:00:36 +0800
Subject: [PATCH] [Bug] Fix bug that checkpoint thread failed to start (#3795)

1. Set thread id before starting the checkpoint thread
2. Init the CHECKPOINT catalog instance before visiting it.
---
 fe/src/main/java/org/apache/doris/PaloFe.java  |  1 -
 .../java/org/apache/doris/catalog/Catalog.java | 18 +++++++++---------
 .../org/apache/doris/common/util/Daemon.java   |  2 +-
 .../org/apache/doris/master/Checkpoint.java    |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/fe/src/main/java/org/apache/doris/PaloFe.java b/fe/src/main/java/org/apache/doris/PaloFe.java
index b9c2217ccf..2f017886ed 100644
--- a/fe/src/main/java/org/apache/doris/PaloFe.java
+++ b/fe/src/main/java/org/apache/doris/PaloFe.java
@@ -72,7 +72,6 @@ public class PaloFe {
             return;
         }
 
-
         CommandLineOptions cmdLineOpts = parseArgs(args);
         System.out.println(cmdLineOpts.toString());
 
diff --git a/fe/src/main/java/org/apache/doris/catalog/Catalog.java b/fe/src/main/java/org/apache/doris/catalog/Catalog.java
index 940d3bdf9f..43fc47f8a1 100755
--- a/fe/src/main/java/org/apache/doris/catalog/Catalog.java
+++ b/fe/src/main/java/org/apache/doris/catalog/Catalog.java
@@ -541,16 +541,13 @@ public class Catalog {
         }
     }
 
-    // use this to get CheckPoint Catalog instance
-    public static Catalog getCheckpoint() {
-        if (CHECKPOINT == null) {
-            CHECKPOINT = new Catalog();
-        }
-        return CHECKPOINT;
-    }
-
     public static Catalog getCurrentCatalog() {
         if (isCheckpointThread()) {
+            // only checkpoint thread it self will goes here.
+            // so no need to care about the thread safe.
+            if (CHECKPOINT == null) {
+                CHECKPOINT = new Catalog();
+            }
             return CHECKPOINT;
         } else {
             return SingletonHolder.INSTANCE;
@@ -1204,8 +1201,11 @@ public class Catalog {
         // start checkpoint thread
         checkpointer = new Checkpoint(editLog);
         checkpointer.setMetaContext(metaContext);
-        checkpointer.start();
+        // set "checkpointThreadId" before the checkpoint thread start, because the thread
+        // need to check the "checkpointThreadId" when running.
         checkpointThreadId = checkpointer.getId();
+
+        checkpointer.start();
         LOG.info("checkpointer thread started. thread id is {}", checkpointThreadId);
 
         // heartbeat mgr
diff --git a/fe/src/main/java/org/apache/doris/common/util/Daemon.java b/fe/src/main/java/org/apache/doris/common/util/Daemon.java
index 3f97ca3504..9edd8f3c2d 100644
--- a/fe/src/main/java/org/apache/doris/common/util/Daemon.java
+++ b/fe/src/main/java/org/apache/doris/common/util/Daemon.java
@@ -115,7 +115,7 @@ public class Daemon extends Thread {
             try {
                 runOneCycle();
             } catch (Throwable e) {
-                LOG.error("daemon thread got exception: ", e);
+                LOG.error("daemon thread got exception. name: {}", getName(), e);
             }
 
             try {
diff --git a/fe/src/main/java/org/apache/doris/master/Checkpoint.java b/fe/src/main/java/org/apache/doris/master/Checkpoint.java
index 2542c31218..3baf7b8558 100644
--- a/fe/src/main/java/org/apache/doris/master/Checkpoint.java
+++ b/fe/src/main/java/org/apache/doris/master/Checkpoint.java
@@ -94,7 +94,7 @@ public class Checkpoint extends MasterDaemon {
         long replayedJournalId = -1;
         // generate new image file
         LOG.info("begin to generate new image: image.{}", checkPointVersion);
-        catalog = Catalog.getCheckpoint();
+        catalog = Catalog.getCurrentCatalog();
         catalog.setEditLog(editLog);
         try {
             catalog.loadImage(imageDir);