Remove the bounded address helper and it's setting

Signed-off-by: Srikanth Padakanti <[email protected]>

Author: Srikanth Padakanti

server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java

@@ -74,27 +74,6 @@ public class ClusterFormationFailureHelper {
         Setting.Property.NodeScope
     );
 
-    public static final Setting<Integer> DISCOVERY_CLUSTER_FORMATION_WARNING_ADDRESS_LIMIT_SETTING = Setting.intSetting(
-        "discovery.cluster_formation_warning_addresses_limit",
-        200,
-        0,
-        Setting.Property.NodeScope
-    );
-
-    /** Package-private for deterministic unit testing of cluster formation warning log formatting. */
-    static String formatListForLog(List<?> items, int limit) {
-        if (items == null || items.isEmpty()) {
-            return "[]";
-        }
-        if (limit <= 0) {
-            return "[... omitted; size=" + items.size() + "]";
-        }
-        if (items.size() <= limit) {
-            return items.toString();
-        }
-        return items.subList(0, limit) + " ... (+" + (items.size() - limit) + " more)";
-    }
-
     private final Supplier<ClusterFormationState> clusterFormationStateSupplier;
     private final ThreadPool threadPool;
     private final TimeValue clusterFormationWarningTimeout;
@@ -210,15 +189,13 @@ String getDescription() {
                 false
             ).map(n -> n.toString()).collect(Collectors.toList());
 
-            final int addressLimit = DISCOVERY_CLUSTER_FORMATION_WARNING_ADDRESS_LIMIT_SETTING.get(settings);
-
             final String discoveryWillContinueDescription = String.format(
                 Locale.ROOT,
                 "node term %d, last-accepted version %d in term %d; discovery will continue using %s from hosts providers and %s from last-known cluster state",
                 currentTerm,
                 clusterState.getVersionOrMetadataVersion(),
                 clusterState.term(),
-                formatListForLog(resolvedAddresses, addressLimit),
+                resolvedAddresses,
                 clusterStateNodes
             );
 

server/src/main/java/org/opensearch/common/settings/ClusterSettings.java

@@ -660,7 +660,6 @@ public void apply(Settings value, Settings current, Settings previous) {
                 PeerFinder.DISCOVERY_FIND_PEERS_INTERVAL_DURING_DECOMMISSION_SETTING,
                 PeerFinder.DISCOVERY_REQUEST_PEERS_TIMEOUT_SETTING,
                 ClusterFormationFailureHelper.DISCOVERY_CLUSTER_FORMATION_WARNING_TIMEOUT_SETTING,
-                ClusterFormationFailureHelper.DISCOVERY_CLUSTER_FORMATION_WARNING_ADDRESS_LIMIT_SETTING,
                 ElectionSchedulerFactory.ELECTION_INITIAL_TIMEOUT_SETTING,
                 ElectionSchedulerFactory.ELECTION_BACK_OFF_TIME_SETTING,
                 ElectionSchedulerFactory.ELECTION_MAX_TIMEOUT_SETTING,

server/src/test/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelperTests.java

@@ -1000,54 +1000,4 @@ public void testDescriptionAfterBootstrapping() {
         );
     }
 
-    public void testFormatListForLogTruncates() {
-        assertThat(ClusterFormationFailureHelper.formatListForLog(null, 10), is("[]"));
-        assertThat(ClusterFormationFailureHelper.formatListForLog(emptyList(), 10), is("[]"));
-
-        assertThat(ClusterFormationFailureHelper.formatListForLog(Arrays.asList("a", "b", "c", "d"), 0), is("[... omitted; size=4]"));
-
-        assertThat(ClusterFormationFailureHelper.formatListForLog(Arrays.asList("a", "b", "c", "d"), 2), is("[a, b] ... (+2 more)"));
-
-        assertThat(ClusterFormationFailureHelper.formatListForLog(Arrays.asList("a", "b", "c", "d"), 4), is("[a, b, c, d]"));
-    }
-
-    public void testDescriptionWithLongHostsProviderAddressesListTruncates() {
-        final Settings settings = Settings.builder()
-            .put(ClusterFormationFailureHelper.DISCOVERY_CLUSTER_FORMATION_WARNING_ADDRESS_LIMIT_SETTING.getKey(), 2)
-            .build();
-
-        final DiscoveryNode localNode = new DiscoveryNode("local", buildNewFakeTransportAddress(), emptyMap(), emptySet(), Version.CURRENT);
-        final ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT)
-            .version(12L)
-            .metadata(Metadata.builder().coordinationMetadata(CoordinationMetadata.builder().term(4L).build()))
-            .nodes(DiscoveryNodes.builder().add(localNode).localNodeId(localNode.getId()))
-            .build();
-
-        final TransportAddress a1 = buildNewFakeTransportAddress();
-        final TransportAddress a2 = buildNewFakeTransportAddress();
-        final TransportAddress a3 = buildNewFakeTransportAddress();
-        final TransportAddress a4 = buildNewFakeTransportAddress();
-        final TransportAddress a5 = buildNewFakeTransportAddress();
-
-        assertThat(
-            new ClusterFormationState(
-                settings,
-                clusterState,
-                Arrays.asList(a1, a2, a3, a4, a5),
-                emptyList(),
-                16L,
-                electionStrategy,
-                new StatusInfo(HEALTHY, "healthy-info")
-            ).getDescription(),
-            is(
-                "cluster-manager not discovered yet: have discovered []; node term 16, last-accepted version 12 in term 4; "
-                    + "discovery will continue using ["
-                    + a1
-                    + ", "
-                    + a2
-                    + "] ... (+3 more) from hosts providers and [] from last-known cluster state"
-            )
-        );
-    }
-
 }