fix: [ha] fixed node aliases

Author: lvca

ha-raft/src/main/java/com/arcadedb/server/ha/raft/PeerAddressAllowlistFilter.java

@@ -122,7 +122,9 @@ private void resolveNow() {
 
   /**
    * Extracts just the host component from every entry in the ArcadeDB HA server list.
-   * Entries follow {@code host:raftPort[:httpPort[:priority]]} or the bracketed IPv6 form.
+   * Entries follow {@code [name@]host:raftPort[:httpPort[:priority]]} or the bracketed IPv6 form.
+   * The optional {@code name@} prefix (e.g. {@code frankfurt@10.0.0.1:2434:2480}) is stripped
+   * before the host is extracted, mirroring {@link RaftPeerAddressResolver#parsePeerList}.
    * <p>
    * An empty or null serverList returns an empty list rather than throwing, so callers can
    * decide whether a missing list is an error.
@@ -134,7 +136,15 @@ static List<String> extractPeerHosts(final String serverList) {
     final String[] entries = serverList.split(",");
     final List<String> hosts = new ArrayList<>(entries.length);
     for (final String entry : entries) {
-      final String trimmed = entry.trim();
+      String trimmed = entry.trim();
+      if (trimmed.isEmpty())
+        continue;
+
+      // Strip the optional human-readable "name@" prefix so it is not mistaken for the host.
+      // parsePeerList allows only one '@'; here we defensively take the part after the first.
+      final int atIdx = trimmed.indexOf('@');
+      if (atIdx >= 0)
+        trimmed = trimmed.substring(atIdx + 1).trim();
       if (trimmed.isEmpty())
         continue;
 

ha-raft/src/main/java/com/arcadedb/server/ha/raft/RaftPeerAddressResolver.java

@@ -164,10 +164,18 @@ Found a localhost (127.0.0.1) in the server list among non-localhost servers. \
   }
 
   /**
-   * Determines the local peer ID. If {@code peerNames} contains an entry whose value equals the
-   * {@code serverName}, the corresponding peer is returned. Otherwise the server name is parsed
-   * for the numeric suffix convention {@code prefix_N} or {@code prefix-N} and used as the index
-   * into {@code peers} (e.g. {@code arcadedb-0} or {@code ArcadeDB_0} maps to index 0).
+   * Determines the local peer ID using three strategies, in priority order:
+   * <ol>
+   *   <li><b>Named peer match:</b> if {@code peerNames} contains an entry whose value equals the
+   *       {@code serverName} (the {@code name@host} syntax), the corresponding peer is returned.</li>
+   *   <li><b>Hostname match:</b> if {@code serverName} equals the host component of a peer's Raft
+   *       address (e.g. server name {@code arcadesplit1} for the list entry
+   *       {@code arcadesplit1:2434:2480}, or an IP), that peer is returned. This lets a plain
+   *       {@code host:raftPort:httpPort} server list work without the {@code prefix_N} convention.</li>
+   *   <li><b>Numeric suffix:</b> the server name is parsed for the {@code prefix_N} / {@code prefix-N}
+   *       convention and used as the zero-based index into {@code peers} (e.g. {@code arcadedb-0}
+   *       or {@code ArcadeDB_0} maps to index 0).</li>
+   * </ol>
    */
   static RaftPeerId findLocalPeerId(final List<RaftPeer> peers, final Map<RaftPeerId, String> peerNames,
       final String serverName, final ArcadeDBServer server) {
@@ -177,18 +185,42 @@ static RaftPeerId findLocalPeerId(final List<RaftPeer> peers, final Map<RaftPeer
           return entry.getKey();
     }
 
+    // Match the server name against the host component of each peer's Raft address. Covers the
+    // plain "host:raftPort:httpPort" (or bare-IP) server list where the node is named after its host.
+    for (final RaftPeer peer : peers)
+      if (serverName.equals(RaftHAServer.extractHost(peer.getAddress())))
+        return peer.getId();
+
     final int separatorIdx;
     try {
       separatorIdx = findLastSeparatorIndex(serverName);
     } catch (final IllegalArgumentException e) {
+      final List<String> configuredNames = peerNames != null ? new ArrayList<>(peerNames.values()) : List.of();
+      final List<String> peerHosts = new ArrayList<>(peers.size());
+      for (final RaftPeer peer : peers)
+        peerHosts.add(RaftHAServer.extractHost(peer.getAddress()));
       throw new IllegalArgumentException(
-          "Server name '" + serverName + "' did not match any configured peer name and has no '_N' or '-N' suffix",
+          "Cannot determine which cluster peer this node is: server name '" + serverName
+              + "' does not match any configured peer name"
+              + (configuredNames.isEmpty() ? "" : " (configured names: " + configuredNames + ")")
+              + ", does not match any host in the server list (hosts: " + peerHosts
+              + "), and does not end with a node index ('-N' or '_N'). Fix this in one of these ways: "
+              + "(1) set 'arcadedb.server.name' to the host of this node as it appears in the server list "
+              + "(e.g. one of " + peerHosts + "); "
+              + "or (2) use the 'name@host:raftPort:httpPort' syntax in the server list and set "
+              + "'arcadedb.server.name' to one of those names; "
+              + "or (3) name each node '" + serverName + "-N' (or '_N'), where N is its zero-based position "
+              + "in the server list (first entry = 0); for " + peers.size() + " peers the valid suffixes are -0 .. -"
+              + (peers.size() - 1) + ".",
           e);
     }
     final int index = Integer.parseInt(serverName.substring(separatorIdx + 1));
     if (index < 0 || index >= peers.size())
       throw new IllegalArgumentException(
-          "Server index " + index + " from name '" + serverName + "' is out of range [0, " + peers.size() + ")");
+          "Server index " + index + " parsed from node name '" + serverName + "' is out of range: the server list has "
+              + peers.size() + " peers, so the index must be zero-based in [0, " + peers.size() + "). "
+              + "For " + peers.size() + " peers name the nodes with suffixes -0 .. -" + (peers.size() - 1)
+              + " (the first server-list entry is index 0, not 1).");
 
     return peers.get(index).getId();
   }

ha-raft/src/test/java/com/arcadedb/server/ha/raft/PeerAddressAllowlistFilterTest.java

@@ -98,6 +98,27 @@ void extractPeerHostsMixedFormats() {
     assertThat(hosts).containsExactly("arcadedb-0", "arcadedb-1", "::1");
   }
 
+  @Test
+  void extractPeerHostsStripsNamePrefixIPv4() {
+    // Regression: the optional "name@" prefix must not be treated as part of the host, otherwise
+    // the allowlist tries to DNS-resolve "arcadesplit1@10.70.2.53" and rejects all peers.
+    final List<String> hosts = PeerAddressAllowlistFilter.extractPeerHosts(
+        "arcadesplit1@10.70.2.53:2434:2480,arcadesplit2@10.70.2.70:2434:2480,arcadesplit3@10.70.2.40:2434:2480");
+    assertThat(hosts).containsExactly("10.70.2.53", "10.70.2.70", "10.70.2.40");
+  }
+
+  @Test
+  void extractPeerHostsStripsNamePrefixHostname() {
+    final List<String> hosts = PeerAddressAllowlistFilter.extractPeerHosts("frankfurt@node1:2434:2480");
+    assertThat(hosts).containsExactly("node1");
+  }
+
+  @Test
+  void extractPeerHostsStripsNamePrefixIPv6Bracketed() {
+    final List<String> hosts = PeerAddressAllowlistFilter.extractPeerHosts("london@[fe80::1]:2434:2480");
+    assertThat(hosts).containsExactly("fe80::1");
+  }
+
   @Test
   void extractPeerHostsSkipsBlankEntries() {
     // Trailing comma creates an empty entry

ha-raft/src/test/java/com/arcadedb/server/ha/raft/RaftHAServerTest.java

@@ -334,6 +334,56 @@ void findLocalPeerIdThrowsWhenSuffixOutOfRange() {
         .isInstanceOf(IllegalArgumentException.class);
   }
 
+  @Test
+  void findLocalPeerIdMatchesByHostname() {
+    // Plain "host:raftPort:httpPort" list with the node named after its host (the user's Attempt 2).
+    // This must now resolve directly, without the prefix_N convention.
+    final var parsed = RaftPeerAddressResolver.parsePeerList(
+        "arcadesplit1:2434:2480,arcadesplit2:2434:2480,arcadesplit3:2434:2480", 2434);
+    assertThat(RaftPeerAddressResolver.findLocalPeerId(parsed.peers(), parsed.peerNames(), "arcadesplit1", null))
+        .isEqualTo(parsed.peers().get(0).getId());
+    assertThat(RaftPeerAddressResolver.findLocalPeerId(parsed.peers(), parsed.peerNames(), "arcadesplit3", null))
+        .isEqualTo(parsed.peers().get(2).getId());
+  }
+
+  @Test
+  void findLocalPeerIdMatchesByBareIp() {
+    // Bare-IP server list (the user's Attempt 3) with the node named after its own IP.
+    final var parsed = RaftPeerAddressResolver.parsePeerList(
+        "10.70.2.53:2434:2480,10.70.2.70:2434:2480,10.70.2.40:2434:2480", 2434);
+    assertThat(RaftPeerAddressResolver.findLocalPeerId(parsed.peers(), parsed.peerNames(), "10.70.2.70", null))
+        .isEqualTo(parsed.peers().get(1).getId());
+  }
+
+  @Test
+  void findLocalPeerIdNoMatchErrorListsAllThreeOptions() {
+    // A server name that matches no peer name, no host, and has no numeric suffix must produce a
+    // message that spells out all three resolution strategies (host name, name@ syntax, -N suffix).
+    final var parsed = RaftPeerAddressResolver.parsePeerList(
+        "arcadesplit1:2434:2480,arcadesplit2:2434:2480,arcadesplit3:2434:2480", 2434);
+    assertThatThrownBy(() -> RaftPeerAddressResolver.findLocalPeerId(
+        parsed.peers(), parsed.peerNames(), "unrelated", null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("arcadedb.server.name")
+        .hasMessageContaining("arcadesplit1")   // listed among the valid host options
+        .hasMessageContaining("name@host")
+        .hasMessageContaining("zero-based");
+  }
+
+  @Test
+  void findLocalPeerIdOutOfRangeErrorIsZeroBased() {
+    // A 3-node cluster named with 1-based suffixes (-3) is the broken workaround; the message
+    // must steer the user to zero-based -0 .. -2.
+    final var parsed = RaftPeerAddressResolver.parsePeerList(
+        "host1:2434,host2:2435,host3:2436", 2434);
+    assertThatThrownBy(() -> RaftPeerAddressResolver.findLocalPeerId(
+        parsed.peers(), parsed.peerNames(), "arcadesplit-3", null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("zero-based")
+        .hasMessageContaining("-0")
+        .hasMessageContaining("-2");
+  }
+
   @Test
   void extractHostFromHostPort() {
     assertThat(RaftHAServer.extractHost("splitter-0.splitter.sbu.svc.cluster.local:2434"))