[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]>
apache · Oct 3, 2024 · ca4cc5a · ca4cc5a
1 parent 79f30d5
commit ca4cc5a
Show file tree

Hide file tree

Showing 56 changed files with 11 additions and 6,146 deletions.
diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template
@@ -31,12 +31,6 @@
   <description>Server port.</description>
 </property>
 
-<property>
-  <name>zeppelin.cluster.addr</name>
-  <value></value>
-  <description>Server cluster address, eg. 127.0.0.1:6000,127.0.0.2:6000,127.0.0.3:6000</description>
-</property>
-
 <property>
   <name>zeppelin.server.ssl.port</name>
   <value>8443</value>

diff --git a/flink/flink-scala-2.12/pom.xml b/flink/flink-scala-2.12/pom.xml
@@ -42,7 +42,6 @@
     <hive.guava.version>14.0.1</hive.guava.version>
     <derby.version>10.14.2.0</derby.version>
     <hiverunner.version>5.3.0</hiverunner.version>
-    <grpc.version>1.15.0</grpc.version>
 
     <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>
   </properties>
@@ -78,10 +77,6 @@
       <artifactId>zeppelin-python</artifactId>
       <version>${project.version}</version>
       <exclusions>
-        <exclusion>
-          <groupId>io.atomix</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
@@ -94,20 +89,6 @@
       <artifactId>zeppelin-interpreter</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>io.atomix</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.grpc</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -117,18 +98,10 @@
       <classifier>tests</classifier>
       <scope>test</scope>
       <exclusions>
-        <exclusion>
-          <groupId>io.atomix</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>io.grpc</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
@@ -292,12 +265,6 @@
       <artifactId>guava</artifactId>
       <version>${hive.guava.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
@@ -51,12 +51,6 @@
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
       <version>${selenium.java.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.code.gson</groupId>
-          <artifactId>gson</artifactId>
-        </exclusion>
-      </exclusions>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -79,20 +73,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>zeppelin-zengine</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.code.gson</groupId>
-          <artifactId>gson</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-        </exclusion>
-      </exclusions>
       <scope>test</scope>
     </dependency>
 
@@ -101,24 +81,12 @@
       <artifactId>spark-interpreter</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
       <artifactId>zeppelin-shell</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
-      <exclusions>
-      <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.zeppelin</groupId>

diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml
@@ -43,16 +43,6 @@
       <artifactId>zeppelin-interpreter</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.atomix</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
@@ -40,7 +40,6 @@
     <!-- must match with maven version -->
     <sisu.plexus.version>0.3.4</sisu.plexus.version>
     <jline.version>2.14.3</jline.version>
-    <atomix.version>3.0.0-rc5</atomix.version>
   </properties>
 
   <dependencies>
@@ -50,30 +49,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.atomix</groupId>
-      <artifactId>atomix</artifactId>
-      <version>${atomix.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-lang3</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>io.atomix</groupId>
-      <artifactId>atomix-raft</artifactId>
-      <version>${atomix.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.atomix</groupId>
-      <artifactId>atomix-primary-backup</artifactId>
-      <version>${atomix.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/cluster/BroadcastServiceAdapter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/cluster/BroadcastServiceAdapter.java
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/cluster/ClusterCallback.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/cluster/ClusterCallback.java