[Runtime] Remove mesos deps and refactor layers (#622)

* rename * fix refs
Netflix · Jan 29, 2024 · b5f1e79 · b5f1e79
1 parent a8c6155
commit b5f1e79
Show file tree

Hide file tree

Showing 113 changed files with 88 additions and 1,232 deletions.
diff --git a/mantis-examples/mantis-examples-sine-function/build.gradle b/mantis-examples/mantis-examples-sine-function/build.gradle
@@ -27,6 +27,6 @@ task execute(type:JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
 }
 dependencies {
-    implementation project(':mantis-server:mantis-server-worker')
+    implementation project(':mantis-runtime-executor')
     implementation libraries.spectatorApi
 }
diff --git a/...-server/mantis-server-worker/build.gradle → mantis-runtime-executor/build.gradle b/...-server/mantis-server-worker/build.gradle → mantis-runtime-executor/build.gradle
@@ -14,20 +14,16 @@
  * limitations under the License.
  */
 
-apply plugin: 'eu.appsatori.fatjar'
 
 ext {
     mantisRxControlVersion = '1.3.+'
-    mesosVersion = '1.7.2'
 }
 
 dependencies {
     api project(":mantis-runtime")
     api project(":mantis-runtime-loader")
     api project(":mantis-server:mantis-server-worker-client")
-    api project(":mantis-server:mantis-server-agent")
 
-    implementation "org.apache.mesos:mesos:$mesosVersion"
     implementation libraries.slf4jApi
     implementation libraries.slf4jLog4j12
     implementation libraries.vavr
@@ -38,7 +34,6 @@ dependencies {
     implementation libraries.httpClient
     implementation "io.mantisrx:mantis-rxcontrol:$mantisRxControlVersion"
     implementation "com.yahoo.datasketches:sketches-core:0.9.1"
-
     implementation libraries.spectatorApi
 
     testImplementation libraries.junit4
@@ -48,10 +43,3 @@ dependencies {
     testImplementation(testFixtures(project(":mantis-common")))
     testImplementation(testFixtures(project(":mantis-control-plane:mantis-control-plane-core")))
 }
-
-// exclude any signed jars
-fatJar {
-    exclude "META-INF/*.SF"
-    exclude "META-INF/*.DSA"
-    exclude "META-INF/*.RSA"
-}
diff --git a/...er/mantis-server-worker/dependencies.lock → mantis-runtime-executor/dependencies.lock b/...er/mantis-server-worker/dependencies.lock → mantis-runtime-executor/dependencies.lock
@@ -23,9 +23,6 @@
         "org.apache.httpcomponents:httpclient": {
             "locked": "4.5.14"
         },
-        "org.apache.mesos:mesos": {
-            "locked": "1.7.2"
-        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.0"
         },
@@ -109,7 +106,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
             ],
-            "locked": "2.12.5"
+            "locked": "2.12.6"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -254,21 +251,12 @@
             "project": true
         },
         "io.mantisrx:mantis-runtime-loader": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-rxcontrol": {
             "locked": "1.3.20"
         },
-        "io.mantisrx:mantis-server-agent": {
-            "project": true
-        },
         "io.mantisrx:mantis-server-worker-client": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-shaded": {
@@ -315,7 +303,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
             ],
-            "locked": "2.12.5"
+            "locked": "2.12.6"
         },
         "nz.ac.waikato.cms.moa:moa": {
             "locked": "2017.06"
@@ -414,7 +402,6 @@
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent",
                 "io.mantisrx:mantis-server-worker-client"
             ],
             "locked": "1.3.10"
@@ -427,8 +414,7 @@
         },
         "com.spotify:completable-futures": {
             "firstLevelTransitive": [
-                "io.mantisrx:mantis-control-plane-client",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-control-plane-client"
             ],
             "locked": "0.3.1"
         },
@@ -438,17 +424,10 @@
         "commons-io:commons-io": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
-                "io.mantisrx:mantis-control-plane-core",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-control-plane-core"
             ],
             "locked": "2.11.0"
         },
-        "io.github.resilience4j:resilience4j-retry": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
-            "locked": "1.5.0"
-        },
         "io.mantisrx:mantis-common": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core",
@@ -495,21 +474,12 @@
             "project": true
         },
         "io.mantisrx:mantis-runtime-loader": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-rxcontrol": {
             "locked": "1.3.20"
         },
-        "io.mantisrx:mantis-server-agent": {
-            "project": true
-        },
         "io.mantisrx:mantis-server-worker-client": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-shaded": {
@@ -558,29 +528,23 @@
         },
         "io.vavr:vavr": {
             "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent",
+                "io.mantisrx:mantis-runtime-loader",
                 "io.mantisrx:mantis-shaded"
             ],
-            "locked": "0.10.2"
+            "locked": "0.9.2"
         },
         "joda-time:joda-time": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
             ],
-            "locked": "2.12.5"
+            "locked": "2.12.6"
         },
         "net.jcip:jcip-annotations": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common"
             ],
             "locked": "1.0"
         },
-        "net.lingala.zip4j:zip4j": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
-            "locked": "2.9.0"
-        },
         "nz.ac.waikato.cms.moa:moa": {
             "locked": "2017.06"
         },
@@ -596,12 +560,6 @@
             ],
             "locked": "1.14.2"
         },
-        "org.apache.hadoop:hadoop-common": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
-            "locked": "2.7.7"
-        },
         "org.apache.httpcomponents:httpclient": {
             "locked": "4.5.14"
         },
@@ -645,18 +603,16 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
                 "io.mantisrx:mantis-remote-observable",
-                "io.mantisrx:mantis-runtime",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-runtime"
             ],
             "locked": "1.7.36"
         },
         "org.slf4j:slf4j-log4j12": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
-                "io.mantisrx:mantis-remote-observable",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-remote-observable"
             ],
-            "locked": "1.7.10"
+            "locked": "1.7.0"
         },
         "org.xerial.snappy:snappy-java": {
             "firstLevelTransitive": [
@@ -742,21 +698,12 @@
             "project": true
         },
         "io.mantisrx:mantis-runtime-loader": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-rxcontrol": {
             "locked": "1.3.20"
         },
-        "io.mantisrx:mantis-server-agent": {
-            "project": true
-        },
         "io.mantisrx:mantis-server-worker-client": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-shaded": {
@@ -806,7 +753,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
             ],
-            "locked": "2.12.5"
+            "locked": "2.12.6"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -912,7 +859,6 @@
         },
         "com.netflix.spectator:spectator-api": {
             "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent",
                 "io.mantisrx:mantis-server-worker-client"
             ],
             "locked": "1.3.10"
@@ -925,8 +871,7 @@
         },
         "com.spotify:completable-futures": {
             "firstLevelTransitive": [
-                "io.mantisrx:mantis-control-plane-client",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-control-plane-client"
             ],
             "locked": "0.3.1"
         },
@@ -936,17 +881,10 @@
         "commons-io:commons-io": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
-                "io.mantisrx:mantis-control-plane-core",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-control-plane-core"
             ],
             "locked": "2.11.0"
         },
-        "io.github.resilience4j:resilience4j-retry": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
-            "locked": "1.5.0"
-        },
         "io.mantisrx:mantis-common": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
@@ -995,21 +933,12 @@
             "project": true
         },
         "io.mantisrx:mantis-runtime-loader": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-rxcontrol": {
             "locked": "1.3.20"
         },
-        "io.mantisrx:mantis-server-agent": {
-            "project": true
-        },
         "io.mantisrx:mantis-server-worker-client": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
             "project": true
         },
         "io.mantisrx:mantis-shaded": {
@@ -1058,10 +987,10 @@
         },
         "io.vavr:vavr": {
             "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent",
+                "io.mantisrx:mantis-runtime-loader",
                 "io.mantisrx:mantis-shaded"
             ],
-            "locked": "0.10.2"
+            "locked": "0.9.2"
         },
         "io.vavr:vavr-test": {
             "locked": "0.9.2"
@@ -1070,7 +999,7 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-control-plane-core"
             ],
-            "locked": "2.12.5"
+            "locked": "2.12.6"
         },
         "junit:junit": {
             "locked": "4.11"
@@ -1084,12 +1013,6 @@
             ],
             "locked": "1.0"
         },
-        "net.lingala.zip4j:zip4j": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
-            "locked": "2.9.0"
-        },
         "nz.ac.waikato.cms.moa:moa": {
             "locked": "2017.06"
         },
@@ -1111,12 +1034,6 @@
             ],
             "locked": "1.14.2"
         },
-        "org.apache.hadoop:hadoop-common": {
-            "firstLevelTransitive": [
-                "io.mantisrx:mantis-server-agent"
-            ],
-            "locked": "2.7.7"
-        },
         "org.apache.httpcomponents:httpclient": {
             "locked": "4.5.14"
         },
@@ -1166,18 +1083,16 @@
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
                 "io.mantisrx:mantis-remote-observable",
-                "io.mantisrx:mantis-runtime",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-runtime"
             ],
             "locked": "1.7.36"
         },
         "org.slf4j:slf4j-log4j12": {
             "firstLevelTransitive": [
                 "io.mantisrx:mantis-common",
-                "io.mantisrx:mantis-remote-observable",
-                "io.mantisrx:mantis-server-agent"
+                "io.mantisrx:mantis-remote-observable"
             ],
-            "locked": "1.7.10"
+            "locked": "1.7.0"
         },
         "org.xerial.snappy:snappy-java": {
             "firstLevelTransitive": [

diff --git a/...rver/worker/DataDroppedPayloadSetter.java → ...rver/worker/DataDroppedPayloadSetter.java b/...rver/worker/DataDroppedPayloadSetter.java → ...rver/worker/DataDroppedPayloadSetter.java
diff --git a/...o/mantisrx/server/worker/DownloadJob.java → ...o/mantisrx/server/worker/DownloadJob.java b/...o/mantisrx/server/worker/DownloadJob.java → ...o/mantisrx/server/worker/DownloadJob.java
diff --git a/...er/worker/ExecuteStageRequestService.java → ...er/worker/ExecuteStageRequestService.java b/...er/worker/ExecuteStageRequestService.java → ...er/worker/ExecuteStageRequestService.java
diff --git a/...tisrx/server/worker/ExecutionDetails.java → ...tisrx/server/worker/ExecutionDetails.java b/...tisrx/server/worker/ExecutionDetails.java → ...tisrx/server/worker/ExecutionDetails.java
diff --git a/.../io/mantisrx/server/worker/Heartbeat.java → .../io/mantisrx/server/worker/Heartbeat.java b/.../io/mantisrx/server/worker/Heartbeat.java → .../io/mantisrx/server/worker/Heartbeat.java
diff --git a/...isrx/server/worker/InstantiationUtil.java → ...isrx/server/worker/InstantiationUtil.java b/...isrx/server/worker/InstantiationUtil.java → ...isrx/server/worker/InstantiationUtil.java