Merge pull request #380 from rpuch/configure-local-member-id-explicitly

Make local member ID explicitly configurable via ClusterConfig

Author: artem-v

cluster-api/src/main/java/io/scalecube/cluster/ClusterConfig.java

@@ -33,6 +33,7 @@ public final class ClusterConfig implements Cloneable {
   private int metadataTimeout = DEFAULT_METADATA_TIMEOUT;
   private MetadataCodec metadataCodec = MetadataCodec.INSTANCE;
 
+  private String memberId;
   private String memberAlias;
   private String externalHost;
   private Integer externalPort;
@@ -159,6 +160,28 @@ public ClusterConfig externalHost(String externalHost) {
     return c;
   }
 
+  /**
+   * Returns ID to use for the local member. If {@code null}, the ID will be generated
+   * automatically.
+   *
+   * @return local member ID.
+   */
+  public String memberId() {
+    return memberId;
+  }
+
+  /**
+   * Sets ID to use for the local member. If {@code null}, the ID will be generated automatically.
+   *
+   * @param memberId local member ID
+   * @return new {@code ClusterConfig} instance
+   */
+  public ClusterConfig memberId(String memberId) {
+    ClusterConfig c = clone();
+    c.memberId = memberId;
+    return c;
+  }
+
   /**
    * Returns memberAlias. {@code memberAlias} is a config property which facilitates {@link
    * io.scalecube.cluster.Member#toString()}.
@@ -291,6 +314,7 @@ public String toString() {
         .add("metadata=" + metadataAsString())
         .add("metadataTimeout=" + metadataTimeout)
         .add("metadataCodec=" + metadataCodec)
+        .add("memberId='" + memberId + "'")
         .add("memberAlias='" + memberAlias + "'")
         .add("externalHost='" + externalHost + "'")
         .add("externalPort=" + externalPort)

cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java

@@ -378,7 +378,7 @@ private Member createLocalMember(Address address) {
             .orElseGet(() -> Address.create(address.host(), port));
 
     return new Member(
-        UUID.randomUUID().toString(),
+        config.memberId() != null ? config.memberId() : UUID.randomUUID().toString(),
         config.memberAlias(),
         memberAddress,
         config.membershipConfig().namespace());

cluster/src/test/java/io/scalecube/cluster/ClusterTest.java

@@ -587,4 +587,23 @@ private void shutdown(List<Cluster> nodes) {
       LOGGER.error("Exception on cluster shutdown", ex);
     }
   }
+
+  @Test
+  public void testExplicitLocalMemberId() {
+    ClusterConfig config = ClusterConfig.defaultConfig()
+      .memberId("test-member");
+
+    ClusterImpl cluster = null;
+    try {
+      cluster = (ClusterImpl) new ClusterImpl(config)
+        .transportFactory(TcpTransportFactory::new)
+        .startAwait();
+
+      assertEquals("test-member", cluster.member().id());
+    } finally {
+      if (cluster != null) {
+        shutdown(Arrays.asList(cluster));
+      }
+    }
+  }
 }