address PR feedback. Signed-off by: Akash Shankaran <akash.shankaran@…

…intel.com> Signed-off-by: Akash Shankaran <[email protected]>
opensearch-project · Sep 18, 2024 · e8e28a2 · e8e28a2
1 parent 1eabadf
commit e8e28a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/src/main/java/org/opensearch/knn/index/KNNSettings.java b/src/main/java/org/opensearch/knn/index/KNNSettings.java
@@ -512,20 +512,12 @@ public static boolean isFaissAVX2Disabled() {
         }
     }
 
-    public static boolean isFaissAVX512Disabled() {
-        try {
-            return KNNSettings.state().getSettingValue(KNNSettings.KNN_FAISS_AVX512_DISABLED);
-        } catch (Exception e) {
-            // In some UTs we identified that cluster setting is not set properly an leads to NPE. This check will avoid
-            // those cases and will still return the default value.
-            log.warn(
-                "Unable to get setting value {} from cluster settings. Using default value as {}",
-                KNN_FAISS_AVX512_DISABLED,
-                KNN_DEFAULT_FAISS_AVX512_DISABLED_VALUE,
-                e
-            );
-            return KNN_DEFAULT_FAISS_AVX512_DISABLED_VALUE;
-        }
+    public static boolean isFaissAVX512Disabled() {        
+            String sValue = KNNSettings.state().getSettingValue(KNNSettings.KNN_FAISS_AVX512_DISABLED);
+            if (sValue != null) {
+                return KNNSettings.state().getSettingValue(KNNSettings.KNN_FAISS_AVX512_DISABLED);
+            }
+            return KNN_DEFAULT_FAISS_AVX512_DISABLED_VALUE;        
     }
 
     public static Integer getFilteredExactSearchThreshold(final String indexName) {

diff --git a/src/main/java/org/opensearch/knn/jni/FaissService.java b/src/main/java/org/opensearch/knn/jni/FaissService.java
@@ -32,7 +32,6 @@
  *      src/main/java/org/opensearch/knn/index/query/KNNQueryResult.java
  *      src/main/java/org/opensearch/knn/common/KNNConstants.java
  */
-@SuppressWarnings("deprecation")
 class FaissService {
 
     static {

diff --git a/src/main/java/org/opensearch/knn/jni/PlatformUtils.java b/src/main/java/org/opensearch/knn/jni/PlatformUtils.java
@@ -20,6 +20,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.security.AccessController;
+import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.Arrays;
 import java.util.Locale;
@@ -109,7 +110,7 @@ public static boolean isAVX512SupportedBySystem() {
                     return Arrays.stream(avx512).allMatch(flags::contains);
                 });
 
-            } catch (Exception e) {
+            } catch (PrivilegedActionException e) {
                 logger.error("[KNN] Error reading file [{}]. [{}]", fileName, e.getMessage(), e);
             }
         }