Always set isReplace when the replace ip is set. (#1102)

Netflix · Sep 5, 2024 · 7433fe8 · 7433fe8
1 parent a782b79
commit 7433fe8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/priam/src/main/java/com/netflix/priam/identity/InstanceIdentity.java b/priam/src/main/java/com/netflix/priam/identity/InstanceIdentity.java
@@ -171,7 +171,7 @@ public void setReplacedIp(String replacedIp) {
             throw new IllegalArgumentException(
                     replacedIp + " is neither empty nor a valid IpV4 address");
         }
-        if (!StringUtils.isEmpty(replacedIp)) this.isReplace = true;
+        this.isReplace = !StringUtils.isEmpty(replacedIp);
     }
 
     private static boolean isInstanceDummy(PriamInstance instance) {

diff --git a/priam/src/test/java/com/netflix/priam/backup/identity/InstanceIdentityTest.java b/priam/src/test/java/com/netflix/priam/backup/identity/InstanceIdentityTest.java
@@ -160,4 +160,20 @@ public void testIsReplace_validReplaceIp() throws Exception {
         identity.setReplacedIp("1.2.3.4");
         Truth.assertThat(identity.isReplace()).isTrue();
     }
+
+    @Test
+    public void testIsReplace_nullThenValid() throws Exception {
+        InstanceIdentity identity = createInstanceIdentity("az1", "fakeinstancex");
+        identity.setReplacedIp(null);
+        identity.setReplacedIp("1.2.3.4");
+        Truth.assertThat(identity.isReplace()).isTrue();
+    }
+
+    @Test
+    public void testIsReplace_validThenNull() throws Exception {
+        InstanceIdentity identity = createInstanceIdentity("az1", "fakeinstancex");
+        identity.setReplacedIp("1.2.3.4");
+        identity.setReplacedIp(null);
+        Truth.assertThat(identity.isReplace()).isFalse();
+    }
 }