Skip to content

Commit ca4cc5a

Browse files
proceaneproceane
authored
[ZEPPELIN-6101] Remove cluster interpreter
### What is this PR for? Remove the cluster interpreter that uses raft-server. ### What type of PR is it? Improvement ### Todos * [x] Remove cluster interpreter, plugin * [x] Remove cluster code in `ZeppelinServer` * [x] Remove config related cluster * [x] Remove atomix-raft dependency * [x] Remove cluster test code ### What is the Jira issue? [ZEPPELIN-6101](https://issues.apache.org/jira/browse/ZEPPELIN-6101) ### How should this be tested? CI ### Screenshots (if appropriate) ### Questions: * Does the license files need to update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Closes #4841 from proceane/remove-raft. Signed-off-by: Cheng Pan <[email protected]>
1 parent 79f30d5 commit ca4cc5a

File tree

56 files changed

+11
-6146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+11
-6146
lines changed

‎conf/zeppelin-site.xml.template

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
<description>Server port.</description>
3232
</property>
3333

34-
<property>
35-
<name>zeppelin.cluster.addr</name>
36-
<value></value>
37-
<description>Server cluster address, eg. 127.0.0.1:6000,127.0.0.2:6000,127.0.0.3:6000</description>
38-
</property>
39-
4034
<property>
4135
<name>zeppelin.server.ssl.port</name>
4236
<value>8443</value>

‎flink/flink-scala-2.12/pom.xml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<hive.guava.version>14.0.1</hive.guava.version>
4343
<derby.version>10.14.2.0</derby.version>
4444
<hiverunner.version>5.3.0</hiverunner.version>
45-
<grpc.version>1.15.0</grpc.version>
4645

4746
<flink.bin.download.url>https://archive.apache.org/dist/flink/flink-${flink.version}/flink-${flink.version}-bin-scala_${flink.scala.binary.version}.tgz</flink.bin.download.url>
4847
</properties>
@@ -78,10 +77,6 @@
7877
<artifactId>zeppelin-python</artifactId>
7978
<version>${project.version}</version>
8079
<exclusions>
81-
<exclusion>
82-
<groupId>io.atomix</groupId>
83-
<artifactId>*</artifactId>
84-
</exclusion>
8580
<exclusion>
8681
<groupId>com.google.guava</groupId>
8782
<artifactId>guava</artifactId>
@@ -94,20 +89,6 @@
9489
<artifactId>zeppelin-interpreter</artifactId>
9590
<version>${project.version}</version>
9691
<scope>provided</scope>
97-
<exclusions>
98-
<exclusion>
99-
<groupId>io.atomix</groupId>
100-
<artifactId>*</artifactId>
101-
</exclusion>
102-
<exclusion>
103-
<groupId>com.google.guava</groupId>
104-
<artifactId>guava</artifactId>
105-
</exclusion>
106-
<exclusion>
107-
<groupId>io.grpc</groupId>
108-
<artifactId>*</artifactId>
109-
</exclusion>
110-
</exclusions>
11192
</dependency>
11293

11394
<dependency>
@@ -117,18 +98,10 @@
11798
<classifier>tests</classifier>
11899
<scope>test</scope>
119100
<exclusions>
120-
<exclusion>
121-
<groupId>io.atomix</groupId>
122-
<artifactId>*</artifactId>
123-
</exclusion>
124101
<exclusion>
125102
<groupId>com.google.guava</groupId>
126103
<artifactId>guava</artifactId>
127104
</exclusion>
128-
<exclusion>
129-
<groupId>io.grpc</groupId>
130-
<artifactId>*</artifactId>
131-
</exclusion>
132105
</exclusions>
133106
</dependency>
134107

@@ -292,12 +265,6 @@
292265
<artifactId>guava</artifactId>
293266
<version>${hive.guava.version}</version>
294267
<scope>provided</scope>
295-
<exclusions>
296-
<exclusion>
297-
<groupId>log4j</groupId>
298-
<artifactId>log4j</artifactId>
299-
</exclusion>
300-
</exclusions>
301268
</dependency>
302269

303270
<dependency>

‎zeppelin-integration/pom.xml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
<groupId>org.seleniumhq.selenium</groupId>
5252
<artifactId>selenium-java</artifactId>
5353
<version>${selenium.java.version}</version>
54-
<exclusions>
55-
<exclusion>
56-
<groupId>com.google.code.gson</groupId>
57-
<artifactId>gson</artifactId>
58-
</exclusion>
59-
</exclusions>
6054
<scope>test</scope>
6155
</dependency>
6256
<dependency>
@@ -79,20 +73,6 @@
7973
<groupId>${project.groupId}</groupId>
8074
<artifactId>zeppelin-zengine</artifactId>
8175
<version>${project.version}</version>
82-
<exclusions>
83-
<exclusion>
84-
<groupId>com.google.guava</groupId>
85-
<artifactId>guava</artifactId>
86-
</exclusion>
87-
<exclusion>
88-
<groupId>com.google.code.gson</groupId>
89-
<artifactId>gson</artifactId>
90-
</exclusion>
91-
<exclusion>
92-
<groupId>org.apache.hadoop</groupId>
93-
<artifactId>hadoop-common</artifactId>
94-
</exclusion>
95-
</exclusions>
9676
<scope>test</scope>
9777
</dependency>
9878

@@ -101,24 +81,12 @@
10181
<artifactId>spark-interpreter</artifactId>
10282
<version>${project.version}</version>
10383
<scope>test</scope>
104-
<exclusions>
105-
<exclusion>
106-
<groupId>com.google.guava</groupId>
107-
<artifactId>guava</artifactId>
108-
</exclusion>
109-
</exclusions>
11084
</dependency>
11185
<dependency>
11286
<groupId>org.apache.zeppelin</groupId>
11387
<artifactId>zeppelin-shell</artifactId>
11488
<version>${project.version}</version>
11589
<scope>test</scope>
116-
<exclusions>
117-
<exclusion>
118-
<groupId>com.google.guava</groupId>
119-
<artifactId>guava</artifactId>
120-
</exclusion>
121-
</exclusions>
12290
</dependency>
12391
<dependency>
12492
<groupId>org.apache.zeppelin</groupId>

‎zeppelin-interpreter-parent/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@
4343
<artifactId>zeppelin-interpreter</artifactId>
4444
<version>${project.version}</version>
4545
<scope>provided</scope>
46-
<exclusions>
47-
<exclusion>
48-
<groupId>io.netty</groupId>
49-
<artifactId>*</artifactId>
50-
</exclusion>
51-
<exclusion>
52-
<groupId>io.atomix</groupId>
53-
<artifactId>*</artifactId>
54-
</exclusion>
55-
</exclusions>
5646
</dependency>
5747

5848
<dependency>

‎zeppelin-interpreter/pom.xml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<!-- must match with maven version -->
4141
<sisu.plexus.version>0.3.4</sisu.plexus.version>
4242
<jline.version>2.14.3</jline.version>
43-
<atomix.version>3.0.0-rc5</atomix.version>
4443
</properties>
4544

4645
<dependencies>
@@ -50,30 +49,6 @@
5049
<version>${project.version}</version>
5150
</dependency>
5251

53-
<dependency>
54-
<groupId>io.atomix</groupId>
55-
<artifactId>atomix</artifactId>
56-
<version>${atomix.version}</version>
57-
<exclusions>
58-
<exclusion>
59-
<groupId>org.apache.commons</groupId>
60-
<artifactId>commons-lang3</artifactId>
61-
</exclusion>
62-
</exclusions>
63-
</dependency>
64-
65-
<dependency>
66-
<groupId>io.atomix</groupId>
67-
<artifactId>atomix-raft</artifactId>
68-
<version>${atomix.version}</version>
69-
</dependency>
70-
71-
<dependency>
72-
<groupId>io.atomix</groupId>
73-
<artifactId>atomix-primary-backup</artifactId>
74-
<version>${atomix.version}</version>
75-
</dependency>
76-
7752
<dependency>
7853
<groupId>org.apache.commons</groupId>
7954
<artifactId>commons-lang3</artifactId>

‎zeppelin-interpreter/src/main/java/org/apache/zeppelin/cluster/BroadcastServiceAdapter.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎zeppelin-interpreter/src/main/java/org/apache/zeppelin/cluster/ClusterCallback.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)