Ensure proper tracking of metadata version

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Dec 3, 2024 · 3888a9f · 3888a9f
1 parent 0dc2151
commit 3888a9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
@@ -679,7 +679,7 @@ static Mode get(Settings settings) {
     public void updateConfiguration(SecurityDynamicConfiguration<RoleV7> rolesConfiguration) {
         try {
             if (rolesConfiguration != null) {
-                DlsFlsProcessedConfig oldConfig = this.dlsFlsProcessedConfig.getAndSet(
+                this.dlsFlsProcessedConfig.set(
                     new DlsFlsProcessedConfig(
                         DynamicConfigFactory.addStatics(rolesConfiguration.clone()),
                         clusterService.state().metadata().getIndicesLookup(),
@@ -688,10 +688,6 @@ public void updateConfiguration(SecurityDynamicConfiguration<RoleV7> rolesConfig
                         fieldMaskingConfig
                     )
                 );
-
-                if (oldConfig != null) {
-                    oldConfig.shutdown();
-                }
             }
         } catch (Exception e) {
             log.error("Error while updating DLS/FLS configuration with {}", rolesConfiguration, e);

diff --git a/src/main/java/org/opensearch/security/privileges/dlsfls/DlsFlsProcessedConfig.java b/src/main/java/org/opensearch/security/privileges/dlsfls/DlsFlsProcessedConfig.java
@@ -71,6 +71,7 @@ protected void updateClusterStateMetadata(Metadata metadata) {
         long duration = System.currentTimeMillis() - start;
 
         log.debug("Updating DlsFlsProcessedConfig took {} ms", duration);
+        this.metadataVersionEffective = metadata.version();
     }
 
     @Override