Fixes after rebase on 01/25

Signed-off-by: Rishabh Maurya <[email protected]>
opensearch-project · Jan 26, 2025 · 08c15a5 · 08c15a5
1 parent 6b8a6e9
commit 08c15a5
Show file tree

Hide file tree

Showing 91 changed files with 55 additions and 9,927 deletions.
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchNode.java
@@ -174,7 +174,6 @@ public class OpenSearchNode implements TestClusterConfiguration {
     private boolean isWorkingDirConfigured = false;
     private String httpPort = "0";
     private String transportPort = "0";
-    private String streamPort = "0";
     private Path confPathData;
     private String keystorePassword = "";
     private boolean preserveDataDir = false;
@@ -1176,8 +1175,6 @@ private void createConfiguration() {
         baseConfig.put("node.portsfile", "true");
         baseConfig.put("http.port", httpPort);
         baseConfig.put("transport.port", transportPort);
-        baseConfig.put("node.attr.transport.stream.port", streamPort);
-
         // Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space
         baseConfig.put("cluster.routing.allocation.disk.watermark.low", "1b");
         baseConfig.put("cluster.routing.allocation.disk.watermark.high", "1b");
@@ -1450,10 +1447,6 @@ void setTransportPort(String transportPort) {
         this.transportPort = transportPort;
     }
 
-    void setStreamPort(String streamPort) {
-        this.streamPort = streamPort;
-    }
-
     void setDataPath(Path dataPath) {
         this.confPathData = dataPath;
     }

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/RunTask.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/RunTask.java
@@ -61,7 +61,6 @@ public class RunTask extends DefaultTestClustersTask {
     public static final String CUSTOM_SETTINGS_PREFIX = "tests.opensearch.";
     private static final int DEFAULT_HTTP_PORT = 9200;
     private static final int DEFAULT_TRANSPORT_PORT = 9300;
-    private static final int DEFAULT_STREAM_PORT = 9880;
     private static final int DEFAULT_DEBUG_PORT = 5005;
     public static final String LOCALHOST_ADDRESS_PREFIX = "127.0.0.1:";
 
@@ -141,8 +140,6 @@ public void beforeStart() {
         int debugPort = DEFAULT_DEBUG_PORT;
         int httpPort = DEFAULT_HTTP_PORT;
         int transportPort = DEFAULT_TRANSPORT_PORT;
-        int streamPort = DEFAULT_STREAM_PORT;
-
         Map<String, String> additionalSettings = System.getProperties()
             .entrySet()
             .stream()
@@ -167,19 +164,15 @@ public void beforeStart() {
             firstNode.setHttpPort(String.valueOf(httpPort));
             httpPort++;
             firstNode.setTransportPort(String.valueOf(transportPort));
-            firstNode.setStreamPort(String.valueOf(streamPort));
             transportPort++;
-            streamPort++;
             firstNode.setting("discovery.seed_hosts", LOCALHOST_ADDRESS_PREFIX + DEFAULT_TRANSPORT_PORT);
             cluster.setPreserveDataDir(preserveData);
             for (OpenSearchNode node : cluster.getNodes()) {
                 if (node != firstNode) {
                     node.setHttpPort(String.valueOf(httpPort));
                     httpPort++;
                     node.setTransportPort(String.valueOf(transportPort));
-                    node.setStreamPort(String.valueOf(streamPort));
                     transportPort++;
-                    streamPort++;
                     node.setting("discovery.seed_hosts", LOCALHOST_ADDRESS_PREFIX + DEFAULT_TRANSPORT_PORT);
                 }
                 additionalSettings.forEach(node::setting);

diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle
@@ -28,7 +28,7 @@
  * under the License.
  */
 
-import org.opensearch.gradle.JavaPackageType
+import org.opensearch.gradle.JavaPackageType 
 
 apply plugin: 'opensearch.internal-distribution-archive-setup'
 
@@ -190,7 +190,7 @@ distribution_archives {
     }
   }
 
-
+  
   linuxPpc64leTar {
     archiveClassifier = 'linux-ppc64le'
     content {

diff --git a/libs/arrow-memory-shaded/licenses/jackson-annotations-LICENSE.txt b/libs/arrow-memory-shaded/licenses/jackson-annotations-LICENSE.txt
diff --git a/libs/arrow-memory-shaded/licenses/jackson-annotations-NOTICE.txt b/libs/arrow-memory-shaded/licenses/jackson-annotations-NOTICE.txt
diff --git a/libs/arrow-memory-shaded/licenses/jackson-databind-LICENSE.txt b/libs/arrow-memory-shaded/licenses/jackson-databind-LICENSE.txt
diff --git a/libs/arrow-memory-shaded/licenses/jackson-databind-NOTICE.txt b/libs/arrow-memory-shaded/licenses/jackson-databind-NOTICE.txt