Implement the cat.pit_segments and cat.segment_replication operat…

…ions (opensearch-project#527) * Implement `cat.pit_segments` and `cat.all_pit_segments` Signed-off-by: Thomas Farr <[email protected]> Allow body on get/head Signed-off-by: Thomas Farr <[email protected]> * Implement `cat.segment_replication` Signed-off-by: Thomas Farr <[email protected]> * Add changelog entry Signed-off-by: Thomas Farr <[email protected]> --------- Signed-off-by: Thomas Farr <[email protected]>
Xtansia · Feb 1, 2024 · c3deb70 · c3deb70
1 parent f095fda
commit c3deb70
Show file tree

Hide file tree

Showing 24 changed files with 2,082 additions and 155 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -47,7 +47,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-nuget-
 
-      - run: "./build.sh integrate ${{ matrix.version }} readonly,writable random:test_only_one --report"
+      - run: "./build.sh integrate ${{ matrix.version }} readonly,replicatedreadonly,writable random:test_only_one --report"
         name: Integration Tests
         working-directory: client
 
@@ -97,7 +97,7 @@ jobs:
           knn_plugin: true
           plugins_output_directory: ${{ env.OPENSEARCH_PLUGINS_DIRECTORY }}
 
-      - run: "./build.sh integrate $OPENSEARCH_VERSION readonly,writable random:test_only_one --report"
+      - run: "./build.sh integrate $OPENSEARCH_VERSION readonly,replicatedreadonly,writable random:test_only_one --report"
         name: Integration Tests
         working-directory: client
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,12 +6,15 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Removed support for the `net461` target ([#256](https://github.com/opensearch-project/opensearch-net/pull/256))
 - Fixed naming of `ClusterManagerTimeout` and `MasterTimeout` properties from `*TimeSpanout` in the low-level client ([#332](https://github.com/opensearch-project/opensearch-net/pull/332))
 
+### Added
+- Added support for the `Cat.PitSegments` and `Cat.SegmentReplication` APIs ([#527](https://github.com/opensearch-project/opensearch-net/pull/527))
+
 ### Removed
 - Removed the `Features` API which is not supported by OpenSearch from the low-level client ([#331](https://github.com/opensearch-project/opensearch-net/pull/331))
 - Removed the deprecated low-level `IndexTemplateV2` APIs in favour of the `ComposableIndexTemplate` APIs ([#437](https://github.com/opensearch-project/opensearch-net/pull/437))
 
 ### Fixed
-- Fix `HttpConnection.ConvertHttpMethod` to support `Patch` method ([#489](https://github.com/opensearch-project/opensearch-net/pull/489))
+- Fixed `HttpConnection.ConvertHttpMethod` to support `Patch` method ([#489](https://github.com/opensearch-project/opensearch-net/pull/489))
 - Fixed `IEnumerable<int?>` property mapping. ([#503](https://github.com/opensearch-project/opensearch-net/pull/503))
 
 ### Dependencies

diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/ClusterBase.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/ClusterBase.cs
@@ -131,11 +131,12 @@ public IDisposable Start(IConsoleLineHandler writer, TimeSpan waitForStarted)
 			OnBeforeStart();
 
 			var subscriptions = new Subscriptions();
-			foreach (var node in Nodes) subscriptions.Add(node.SubscribeLines(writer));
 
-			var waitHandles = Nodes.Select(w => w.StartedHandle).ToArray();
-			if (!WaitHandle.WaitAll(waitHandles, waitForStarted))
+			foreach (var node in Nodes)
 			{
+				subscriptions.Add(node.SubscribeLines(writer));
+				if (node.WaitForStarted(waitForStarted)) continue;
+
 				var nodeExceptions = Nodes.Select(n => n.LastSeenException).Where(e => e != null).ToList();
 				writer?.WriteError(
 					$"{{{GetType().Name}.{nameof(Start)}}} cluster did not start after {waitForStarted}");

diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/OpenSearchNode.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/OpenSearchNode.cs
@@ -88,7 +88,10 @@ private static StartArguments StartArgs(NodeConfiguration config)
 
 		private static Dictionary<string, string> EnvVars(NodeConfiguration config)
 		{
-			var environmentVariables = new Dictionary<string, string> { { "OPENSEARCH_JAVA_OPTS", "-Xms1g -Xmx1g" } };
+			var javaOpts = new List<string> { "-Xms1g", "-Xmx1g" };
+
+			var environmentVariables = new Dictionary<string, string> { { "OPENSEARCH_JAVA_OPTS", string.Join(" ", javaOpts) } };
+
 			if (!string.IsNullOrWhiteSpace(config.FileSystem.ConfigPath))
 				environmentVariables.Add(config.FileSystem.ConfigEnvironmentVariableName, config.FileSystem.ConfigPath);
 

diff --git a/src/ApiGenerator/Configuration/CodeConfiguration.cs b/src/ApiGenerator/Configuration/CodeConfiguration.cs
@@ -42,28 +42,7 @@ public static class CodeConfiguration
 			new("{create,delete}_pit"),
 			new("{delete,get}_all_pits"),
 
-			new("cat.aliases"),
-			new("cat.allocation"),
-			new("cat.cluster_manager"),
-			new("cat.count"),
-			new("cat.fielddata"),
-			new("cat.health"),
-			new("cat.help"),
-			new("cat.indices"),
-			new("cat.master"),
-			new("cat.nodeattrs"),
-			new("cat.nodes"),
-			new("cat.pending_tasks"),
-			new("cat.plugins"),
-			new("cat.recovery"),
-			new("cat.repositories"),
-			new("cat.segments"),
-			new("cat.shards"),
-			new("cat.snapshots"),
-			new("cat.tasks"),
-			new("cat.templates"),
-			new("cat.thread_pool"),
-
+			new("cat.*"),
 			new("cluster.*"),
 			new("dangling_indices.*"),