This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/cluster by this push:
new a1d3da2 fix log conflicts
a1d3da2 is described below
commit a1d3da2954c4b88ece2a1cd3bea38a45336d466b
Author: lta <[email protected]>
AuthorDate: Thu Mar 28 17:06:10 2019 +0800
fix log conflicts
---
cluster/pom.xml | 96 +++++-----------------
.../cluster/qp/executor/NonQueryExecutor.java | 4 +-
.../org/apache/iotdb/cluster/utils/RaftUtils.java | 2 +
3 files changed, 25 insertions(+), 77 deletions(-)
diff --git a/cluster/pom.xml b/cluster/pom.xml
index d420cab..5f90958 100644
--- a/cluster/pom.xml
+++ b/cluster/pom.xml
@@ -47,80 +47,28 @@
<groupId>com.alipay.sofa</groupId>
<artifactId>jraft-core</artifactId>
<version>${jraft.version}</version>
- </dependency>
- <!-- jsr305 -->
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- </dependency>
- <!-- bolt -->
- <dependency>
- <groupId>com.alipay.sofa</groupId>
- <artifactId>bolt</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>com.alipay.sofa</groupId>
- <artifactId>hessian</artifactId>
- <version>3.3.6</version>
- </dependency>
- <!-- log -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
- </dependency>
- <!-- disruptor -->
- <dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- <version>3.3.7</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <!-- protobuf -->
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>3.5.1</version>
- </dependency>
- <!-- protostuff -->
- <dependency>
- <groupId>io.protostuff</groupId>
- <artifactId>protostuff-core</artifactId>
- <version>1.6.0</version>
- </dependency>
- <dependency>
- <groupId>io.protostuff</groupId>
- <artifactId>protostuff-runtime</artifactId>
- <version>1.6.0</version>
- </dependency>
- <!-- rocksdb -->
- <dependency>
- <groupId>org.rocksdb</groupId>
- <artifactId>rocksdbjni</artifactId>
- <version>5.14.2</version>
- </dependency>
- <!-- java thread affinity -->
- <dependency>
- <groupId>net.openhft</groupId>
- <artifactId>affinity</artifactId>
- <version>3.1.7</version>
- </dependency>
- <!-- metrics -->
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>4.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java
b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java
index 25d83d4..5510a5a 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java
+++
b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java
@@ -220,7 +220,6 @@ public class NonQueryExecutor extends ClusterQPExecutor {
*
* @param task request task
* @param leader leader of the target raft group
- * @param latch wait for results
* @param taskRetryNum Number of task retries due to timeout and redirected.
* @return request result
*/
@@ -234,8 +233,7 @@ public class NonQueryExecutor extends ClusterQPExecutor {
/** Call async method **/
client.asyncHandleRequest(cliClientService, task.getRequest(), leader,
task);
task.await();
- if (task.getTaskState() == TaskState.INITIAL || task.getTaskState() ==
TaskState.REDIRECT
- || task.getTaskState() == TaskState.EXCEPTION) {
+ if (task.getTaskState() != TaskState.FINISH) {
task.setTaskNum(SUB_TASK_NUM);
return asyncHandleTask(task, leader, taskRetryNum + 1);
}
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
index f4f4c4f..95383c5 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
@@ -22,6 +22,7 @@ import com.alipay.sofa.jraft.RouteTable;
import com.alipay.sofa.jraft.conf.Configuration;
import com.alipay.sofa.jraft.entity.PeerId;
import com.alipay.sofa.jraft.rpc.impl.cli.BoltCliClientService;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeoutException;
import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
@@ -35,6 +36,7 @@ public class RaftUtils {
private static final ClusterConfig CLUSTER_CONFIG =
ClusterDescriptor.getInstance().getConfig();
private static final Server server = Server.getInstance();
+ private static final ConcurrentHashMap<String, PeerId> groupLeaderCache =
new ConcurrentHashMap<>();
private RaftUtils() {
}
