(ranger) branch master updated: RANGER-5319: Follow-up: Check for tagsync HA not required (#668)

[fatehsingh]

This is an automated email from the ASF dual-hosted git repository.

fatehsingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 2ec6cfd0e RANGER-5319: Follow-up: Check for tagsync HA not required 
(#668)
2ec6cfd0e is described below

commit 2ec6cfd0ea90840d26b6b4a13d9fc697542e30e7
Author: Fateh Singh <fateh...@gmail.com>
AuthorDate: Wed Sep 17 21:27:22 2025 -0700

    RANGER-5319: Follow-up: Check for tagsync HA not required (#668)
    
    * RANGER-5319: Follow-up: Check for tagsync ha not required
    * RANGER-5319: Follow-up: Preserve interrupt status of thread
---
 .../apache/ranger/tagsync/process/TagSyncConfig.java  |  4 ----
 .../tagsync/sink/tagadmin/TagAdminRESTSink.java       | 19 +++++++++----------
 .../ranger/tagsync/source/atlas/AtlasTagSource.java   | 19 +++++++++----------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git 
a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java 
b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
index 26aff8a8f..df02b747a 100644
--- a/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
+++ b/tagsync/src/main/java/org/apache/ranger/tagsync/process/TagSyncConfig.java
@@ -195,10 +195,6 @@ public static synchronized boolean 
isTagSyncServiceActive() {
         return 
TagSyncHAInitializerImpl.getInstance(TagSyncConfig.getInstance()).isActive();
     }
 
-    public boolean isTagSyncHAEnabled() {
-        return this.getBoolean(TAGSYNC_SERVER_HA_ENABLED_PARAM, false);
-    }
-
     public static long getTagSyncHAPassiveSleepInterval() {
         return DEFAULT_TAGSYNC_HA_PASSIVE_SLEEP_INTERVAL;
     }
diff --git 
a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
 
b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
index 5472a5c30..b06d190f0 100644
--- 
a/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
+++ 
b/tagsync/src/main/java/org/apache/ranger/tagsync/sink/tagadmin/TagAdminRESTSink.java
@@ -181,16 +181,15 @@ public void run() {
                     return;
                 }
             } else {
-                // Only sleep when HA is enabled, similar to user sync
-                if (TagSyncConfig.getInstance().isTagSyncHAEnabled()) {
-                    try {
-                        long sleepInterval = 
TagSyncConfig.getTagSyncHAPassiveSleepInterval();
-                        LOG.debug("Sleeping for [{}] milliSeconds as this 
server is running in passive mode", sleepInterval);
-                        Thread.sleep(sleepInterval);
-                    } catch (InterruptedException interrupted) {
-                        LOG.error("Interrupted..: ", interrupted);
-                        return;
-                    }
+                try {
+                    long sleepInterval = 
TagSyncConfig.getTagSyncHAPassiveSleepInterval();
+                    LOG.debug("Sleeping for [{}] milliSeconds as this server 
is running in passive mode", sleepInterval);
+                    Thread.sleep(sleepInterval);
+                } catch (InterruptedException interrupted) {
+                    LOG.error("Interrupted..: ", interrupted);
+                    // preserve interrupt status for caller of the thread
+                    Thread.currentThread().interrupt();
+                    return;
                 }
             }
         }
diff --git 
a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
 
b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
index c4438ce64..75dffc9f7 100644
--- 
a/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
+++ 
b/tagsync/src/main/java/org/apache/ranger/tagsync/source/atlas/AtlasTagSource.java
@@ -232,16 +232,15 @@ public void run() {
                         }
                     }
                 } else {
-                    // Only sleep when HA is enabled, similar to user sync
-                    if (TagSyncConfig.getInstance().isTagSyncHAEnabled()) {
-                        try {
-                            long sleepInterval = 
TagSyncConfig.getTagSyncHAPassiveSleepInterval();
-                            LOG.debug("Sleeping for [{}] milliSeconds as this 
server is running in passive mode", sleepInterval);
-                            Thread.sleep(sleepInterval);
-                        } catch (InterruptedException interrupted) {
-                            LOG.error("Interrupted: ", interrupted);
-                            return;
-                        }
+                    try {
+                        long sleepInterval = 
TagSyncConfig.getTagSyncHAPassiveSleepInterval();
+                        LOG.debug("Sleeping for [{}] milliSeconds as this 
server is running in passive mode", sleepInterval);
+                        Thread.sleep(sleepInterval);
+                    } catch (InterruptedException interrupted) {
+                        LOG.error("Interrupted: ", interrupted);
+                        // preserve interrupt status for caller of the thread
+                        Thread.currentThread().interrupt();
+                        return;
                     }
                 }
             }