fix:fix worker pool size and move files

Signed-off-by: grapebaba <281165273@qq.com>
optimism-java · Jul 13, 2023 · 71cdeb4 · 71cdeb4
1 parent 4642d4c
commit 71cdeb4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/hildr-node/src/main/java/io/optimism/driver/Driver.java b/hildr-node/src/main/java/io/optimism/driver/Driver.java
@@ -25,7 +25,6 @@
 import io.optimism.common.BlockInfo;
 import io.optimism.common.Epoch;
 import io.optimism.common.HildrServiceExecutionException;
-import io.optimism.concurrency.TracerTaskWrapper;
 import io.optimism.config.Config;
 import io.optimism.derive.Pipeline;
 import io.optimism.engine.Engine;
@@ -36,6 +35,7 @@
 import io.optimism.l1.ChainWatcher;
 import io.optimism.rpc.RpcServer;
 import io.optimism.telemetry.InnerMetrics;
+import io.optimism.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.util.List;

diff --git a/hildr-node/src/main/java/io/optimism/driver/EngineDriver.java b/hildr-node/src/main/java/io/optimism/driver/EngineDriver.java
@@ -18,7 +18,6 @@
 
 import io.optimism.common.BlockInfo;
 import io.optimism.common.Epoch;
-import io.optimism.concurrency.TracerTaskWrapper;
 import io.optimism.config.Config;
 import io.optimism.engine.Engine;
 import io.optimism.engine.EngineApi;
@@ -31,6 +30,7 @@
 import io.optimism.engine.OpEthExecutionPayload;
 import io.optimism.engine.OpEthForkChoiceUpdate;
 import io.optimism.engine.OpEthPayloadStatus;
+import io.optimism.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

diff --git a/hildr-node/src/main/java/io/optimism/rpc/RpcServer.java b/hildr-node/src/main/java/io/optimism/rpc/RpcServer.java
@@ -75,7 +75,7 @@ public RpcServer(final Config config) {
     this.config = config;
     this.activeConnectionsCount = new AtomicInteger();
     this.maxActiveConnections = DEFAULT_MAX_ACTIVE_CONNECTIONS;
-    this.vertx = Vertx.vertx(new VertxOptions().setWorkerPoolSize(1));
+    this.vertx = Vertx.vertx(new VertxOptions().setWorkerPoolSize(20));
     this.methods = new JsonRpcMethodsFactory().methods(this.config);
   }
 

diff --git a/hildr-node/src/main/java/io/optimism/rpc/methods/OutputAtBlock.java b/hildr-node/src/main/java/io/optimism/rpc/methods/OutputAtBlock.java
@@ -17,14 +17,14 @@
 package io.optimism.rpc.methods;
 
 import io.optimism.common.HildrServiceExecutionException;
-import io.optimism.concurrency.TracerTaskWrapper;
 import io.optimism.rpc.RpcMethod;
 import io.optimism.rpc.internal.JsonRpcRequestContext;
 import io.optimism.rpc.internal.response.JsonRpcResponse;
 import io.optimism.rpc.internal.response.JsonRpcSuccessResponse;
 import io.optimism.rpc.internal.result.EthGetProof;
 import io.optimism.rpc.internal.result.OutputRootResult;
 import io.optimism.rpc.provider.Web3jProvider;
+import io.optimism.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/hildr-node/src/main/java/io/optimism/runner/Runner.java b/hildr-node/src/main/java/io/optimism/runner/Runner.java
@@ -18,7 +18,6 @@
 
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 import io.optimism.common.BlockNotIncludedException;
-import io.optimism.concurrency.TracerTaskWrapper;
 import io.optimism.config.Config;
 import io.optimism.config.Config.SyncMode;
 import io.optimism.config.Config.SystemAccounts;
@@ -31,6 +30,7 @@
 import io.optimism.engine.ForkChoiceUpdate.ForkchoiceState;
 import io.optimism.engine.OpEthForkChoiceUpdate;
 import io.optimism.engine.OpEthPayloadStatus;
+import io.optimism.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.util.Arrays;

diff --git a/...mism/log/LazyInitRollingFileAppender.java → ...elemetry/LazyInitRollingFileAppender.java b/...mism/log/LazyInitRollingFileAppender.java → ...elemetry/LazyInitRollingFileAppender.java
@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package io.optimism.log;
+package io.optimism.telemetry;
 
 import ch.qos.logback.core.rolling.RollingFileAppender;
 

diff --git a/...timism/concurrency/TracerTaskWrapper.java → ...optimism/telemetry/TracerTaskWrapper.java b/...timism/concurrency/TracerTaskWrapper.java → ...optimism/telemetry/TracerTaskWrapper.java
@@ -14,11 +14,10 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package io.optimism.concurrency;
+package io.optimism.telemetry;
 
 import io.micrometer.tracing.Span;
 import io.micrometer.tracing.Tracer;
-import io.optimism.telemetry.Logging;
 import java.util.concurrent.Callable;
 
 /**

diff --git a/hildr-node/src/main/resources/META-INF/native-image/reflect-config.json b/hildr-node/src/main/resources/META-INF/native-image/reflect-config.json
@@ -367,7 +367,7 @@
     ]
   },
   {
-    "name":"io.optimism.log.LazyInitRollingFileAppender",
+    "name":"io.optimism.telemetry.LazyInitRollingFileAppender",
     "queryAllPublicMethods":true,
     "methods":[{"name":"<init>","parameterTypes":[] }]
   },

diff --git a/hildr-node/src/main/resources/logback.xml b/hildr-node/src/main/resources/logback.xml
@@ -6,7 +6,7 @@
     </encoder>
   </appender>
 
-  <appender name="FILE" class="io.optimism.log.LazyInitRollingFileAppender">
+  <appender name="FILE" class="io.optimism.telemetry.LazyInitRollingFileAppender">
     <file>logs/app.log</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
       <fileNamePattern>app-%d{yyyy-MM-dd HH}.gz</fileNamePattern>

diff --git a/hildr-node/src/test/java/io/optimism/rpc/RpcServerTest.java b/hildr-node/src/test/java/io/optimism/rpc/RpcServerTest.java
@@ -23,11 +23,11 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.optimism.TestConstants;
-import io.optimism.concurrency.TracerTaskWrapper;
 import io.optimism.config.Config;
 import io.optimism.rpc.internal.JsonRpcRequest;
 import io.optimism.rpc.internal.JsonRpcRequestId;
 import io.optimism.rpc.internal.result.OutputRootResult;
+import io.optimism.telemetry.TracerTaskWrapper;
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.Future;