Merge pull request #6233 from halibobo1205/feat/services_init_opt

feat(service): exit when params init failed

Author: CodeNinjaEvan

common/src/main/java/org/tron/core/exception/TronError.java

@@ -45,6 +45,8 @@ public enum ErrCode {
     TRON_NET_SERVICE_INIT(1),
     ZCASH_INIT(1),
     LOG_LOAD(1),
+    WITNESS_INIT(1),
+    RATE_LIMITER_INIT(1),
     SOLID_NODE_INIT(0);
 
     private final int code;

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -451,7 +451,8 @@ public static void setParam(final Config config) {
 
     if (PARAMETER.isWitness()
         && CollectionUtils.isEmpty(localWitnesses.getPrivateKeys())) {
-      logger.warn("This is a witness node, but localWitnesses is null");
+      throw new TronError("This is a witness node, but localWitnesses is null",
+          TronError.ErrCode.WITNESS_INIT);
     }
 
     if (config.hasPath(Constant.VM_SUPPORT_CONSTANT)) {
@@ -1142,7 +1143,7 @@ public static void setParam(final Config config) {
         PARAMETER.shutdownBlockTime = new CronExpression(config.getString(
             Constant.NODE_SHUTDOWN_BLOCK_TIME));
       } catch (ParseException e) {
-        logger.error(e.getMessage(), e);
+        throw new TronError(e, TronError.ErrCode.AUTO_STOP_PARAMS);
       }
     }
 

framework/src/main/java/org/tron/core/services/http/RateLimiterServlet.java

@@ -16,6 +16,7 @@
 import org.tron.common.prometheus.MetricLabels;
 import org.tron.common.prometheus.Metrics;
 import org.tron.core.config.args.Args;
+import org.tron.core.exception.TronError;
 import org.tron.core.services.ratelimiter.GlobalRateLimiter;
 import org.tron.core.services.ratelimiter.RateLimiterContainer;
 import org.tron.core.services.ratelimiter.RuntimeData;
@@ -40,6 +41,7 @@ private void addRateContainer() {
     RateLimiterInitialization.HttpRateLimiterItem item = Args.getInstance()
         .getRateLimiterInitialization().getHttpMap().get(getClass().getSimpleName());
     boolean success = false;
+    final String name = getClass().getSimpleName();
     if (item != null) {
       String cName = "";
       String params = "";
@@ -54,32 +56,35 @@ private void addRateContainer() {
             || c == IPQPSRateLimiterAdapter.class) {
           constructor = c.getConstructor(String.class);
           obj = constructor.newInstance(params);
-          container.add(KEY_PREFIX_HTTP, getClass().getSimpleName(), (IRateLimiter) obj);
+          container.add(KEY_PREFIX_HTTP, name, (IRateLimiter) obj);
         } else {
           constructor = c.getConstructor();
           obj = constructor.newInstance(QpsStrategy.DEFAULT_QPS_PARAM);
-          container.add(KEY_PREFIX_HTTP, getClass().getSimpleName(), (IRateLimiter) obj);
+          container.add(KEY_PREFIX_HTTP, name, (IRateLimiter) obj);
         }
         success = true;
       } catch (Exception e) {
-        logger.warn("failure to add the rate limiter strategy. servlet = {}, "
-                + "strategy name = {}, params = \"{}\".",
-            getClass().getSimpleName(), cName, params);
+        this.throwTronError(cName, params, name, e);
       }
     }
     if (!success) {
       // if the specific rate limiter strategy of servlet is not defined or fail to add,
       // then add a default Strategy.
       try {
         IRateLimiter rateLimiter = new DefaultBaseQqsAdapter(QpsStrategy.DEFAULT_QPS_PARAM);
-        container.add(KEY_PREFIX_HTTP, getClass().getSimpleName(), rateLimiter);
+        container.add(KEY_PREFIX_HTTP, name, rateLimiter);
       } catch (Exception e) {
-        logger.warn("failure to add the default rate limiter strategy. servlet = {}.",
-            getClass().getSimpleName());
+        this.throwTronError("DefaultBaseQqsAdapter", QpsStrategy.DEFAULT_QPS_PARAM, name, e);
       }
     }
   }
 
+  private void throwTronError(String strategy, String params, String servlet,  Exception e) {
+    throw new TronError("failure to add the rate limiter strategy. servlet = " + servlet
+        + ", strategy name = " + strategy + ", params = \"" + params + "\".",
+            e, TronError.ErrCode.RATE_LIMITER_INIT);
+  }
+
   @Override
   protected void service(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {

framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeOutOfTimeTest.java

@@ -73,7 +73,6 @@ public class BandWidthRuntimeOutOfTimeTest extends BaseTest {
             "--output-directory", dbPath(),
             "--storage-db-directory", dbDirectory,
             "--storage-index-directory", indexDirectory,
-            "-w",
             "--debug"
         },
         "config-test-mainnet.conf"

framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeOutOfTimeWithCheckTest.java

@@ -74,7 +74,6 @@ public class BandWidthRuntimeOutOfTimeWithCheckTest extends BaseTest {
             "--output-directory", dbPath(),
             "--storage-db-directory", dbDirectory,
             "--storage-index-directory", indexDirectory,
-            "-w",
             "--debug"
         },
         "config-test-mainnet.conf"

framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeTest.java

@@ -69,7 +69,6 @@ public static void init() {
             "--output-directory", dbPath(),
             "--storage-db-directory", dbDirectory,
             "--storage-index-directory", indexDirectory,
-            "-w"
         },
         "config-test-mainnet.conf"
     );

framework/src/test/java/org/tron/common/runtime/vm/BandWidthRuntimeWithCheckTest.java

@@ -76,7 +76,6 @@ public class BandWidthRuntimeWithCheckTest extends BaseTest {
             "--output-directory", dbPath(),
             "--storage-db-directory", dbDirectory,
             "--storage-index-directory", indexDirectory,
-            "-w"
         },
         "config-test-mainnet.conf"
     );

framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java

@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -41,9 +42,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.FileUtil;
@@ -74,9 +73,6 @@ public class LevelDbDataSourceImplTest {
   private byte[] key5 = "00000005aa".getBytes();
   private byte[] key6 = "00000006aa".getBytes();
 
-  @Rule
-  public final ExpectedException exception = ExpectedException.none();
-
   /**
    * Release resources.
    */
@@ -351,12 +347,11 @@ public void prefixQueryTest() {
 
   @Test
   public void initDbTest() {
-    exception.expect(TronError.class);
     makeExceptionDb("test_initDb");
     LevelDbDataSourceImpl dataSource = new LevelDbDataSourceImpl(
         Args.getInstance().getOutputDirectory(), "test_initDb");
-    dataSource.initDB();
-    dataSource.closeDB();
+    TronError thrown = assertThrows(TronError.class, dataSource::initDB);
+    assertEquals(TronError.ErrCode.LEVELDB_INIT, thrown.getErrCode());
   }
 
   private void makeExceptionDb(String dbName) {

framework/src/test/java/org/tron/common/storage/leveldb/RocksDbDataSourceImplTest.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -23,9 +24,7 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.tron.common.storage.rocksdb.RocksDbDataSourceImpl;
 import org.tron.common.utils.ByteArray;
@@ -56,9 +55,6 @@ public class RocksDbDataSourceImplTest {
   private byte[] key5 = "00000005aa".getBytes();
   private byte[] key6 = "00000006aa".getBytes();
 
-  @Rule
-  public final ExpectedException exception = ExpectedException.none();
-
   /**
    * Release resources.
    */
@@ -393,12 +389,11 @@ public void prefixQueryTest() {
 
   @Test
   public void initDbTest() {
-    exception.expect(TronError.class);
     makeExceptionDb("test_initDb");
     RocksDbDataSourceImpl dataSource = new RocksDbDataSourceImpl(
         Args.getInstance().getOutputDirectory(), "test_initDb");
-    dataSource.initDB();
-    dataSource.closeDB();
+    TronError thrown = assertThrows(TronError.class, dataSource::initDB);
+    assertEquals(TronError.ErrCode.ROCKSDB_INIT, thrown.getErrCode());
   }
 
   private void makeExceptionDb(String dbName) {

framework/src/test/java/org/tron/core/ForkControllerTest.java

@@ -31,7 +31,7 @@ public class ForkControllerTest {
   @Before
   public void init() throws IOException {
     Args.setParam(new String[]{"-d",
-        temporaryFolder.newFolder().toString(), "-w"}, Constant.TEST_CONF);
+        temporaryFolder.newFolder().toString()}, Constant.TEST_CONF);
     context = new TronApplicationContext(DefaultConfig.class);
     dynamicPropertiesStore = context.getBean(DynamicPropertiesStore.class);
     chainBaseManager = context.getBean(ChainBaseManager.class);