Revert "Merge from master to 1.10 (#189)" (#192)

This reverts commit 4e7e8b4.

Author: sruti1312

build.gradle

@@ -200,10 +200,6 @@ static def propEnabled(property) {
 
 // The following Gradle tasks are used to create a PA/RCA enabled Elasticsearch cluster
 // Pass the -Dtests.enableIT property to Gradle to run ITs
-/**
- * cloneGitRepo clones the performance-analyzer-rca repo if the -Dtests.enableIT=true flag is passed
- * to the Gradle JVM
- */
 task cloneGitRepo(type: GitClone) {
     rcaDir = Paths.get(getProject().getBuildDir().toString(), "performance-analyzer-rca").toString()
     def destination = file(rcaDir)
@@ -277,10 +273,6 @@ bundlePlugin {
     }
 }
 
-/**
- * setupESCluster spins up a local 2 node ES cluster using the enableRca task in the performance-analyzer-rca
- * repo. The performance-analyzer-rca repo is cloned as part of the cloneGitRepo task.
- */
 task setupEsCluster() {
     dependsOn(cloneGitRepo)
     onlyIf = {
@@ -295,30 +287,6 @@ task setupEsCluster() {
     }
 }
 
-/**
- * integTestRunner is a task provided by the ES test framework, which allows us to spin up clients
- * and test API calls against a local or remote Elasticsearch cluster.
- *
- * The simplest way to run this task in a way that "just works" is to invoke
- * ./gradlew integTest -Dtests.enableIT=true -Dtests.useDockerCluster=true
- * which will spin up a local 2 node ES cluster on your machine, then execute the test suite against it
- *
- * A full list of options is provided below. Check our gradle.properties file for the defaults for
- * each of these properties.
- *
- * -Dtests.rest.cluster the Elasticsearch REST endpoint that test clients should hit
- * -Dtests.cluster the Elasticsearch <a href="https://discuss.elastic.co/t/transport-client-vs-rest-client/13936">transport</a>
- *      endpoint that test clients should hit
- * -Dtests.enableIT a flag to enable integration testing, by default this is false
- * -Dtests.useDockerCluster if true, spin up a local 2 node cluster before executing tests
- *        NOTE: if you specify this, don't specify -Dtests.rest.cluster or -Dtests.cluster
- * -Dtests.pa.port the port number of the PerformanceAnalyzer REST endpoint
- * -Dtests.https either true or false, if true, then instantiate REST and transport clients using
- *      the https:// protocol and basic authentication via the -Dtests.user and -Dtests.password properties
- * -Dtests.user the username of the admin user, this is used in conjunction with -Dtests.https and
- *      -Dtests.password to authenticate requests in the opendistro-security context
- * -Dtests.password the password of the admin user specified by -Dtests.user
- */
 integTestRunner {
     onlyIf = {
         propEnabled("tests.enableIT")

gradle.properties

@@ -7,24 +7,8 @@
 systemProp.tests.rest.cluster=localhost:9200
 # The Elasticsearch cluster node communication endpoint
 systemProp.tests.cluster=localhost:9300
-
 # The Elasticsearch cluster name for integ tests
 systemProp.tests.clustername=IntegTestCluster
-
-# Set this to true if you want a cluster spun up for integration testing
-systemProp.tests.useDockerCluster=false
-
-# Set this to true if you want to enable integration testing
-systemProp.tests.enableIT=false
-
-# The port number for the PerformanceAnalyzer WebService
-systemProp.tests.pa.port=9600
-
-# Whether or not to use https for REST and transport clients
-systemProp.tests.https=false
-
-# The username of the admin user (or any user able to auth requests against opendistro-security)
-# NOTE: this only does something if tests.https is set to true
-systemProp.tests.user=admin
-# The password of the user specified above
-systemProp.tests.password=admin
+# Whether or not to spin up a new Elasticsearch cluster for integration testing
+# Comment this out if you don't want a cluster spun up
+systemProp.tests.useDockerCluster=

licenses/performanceanalyzer-rca-1.10.jar.sha1

@@ -1 +1 @@
-830001e9ac4b0622979a0b7143a98990832364a4
+9c4d17774058b44a6f2ee6b9752c4f4254414784

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/config/setting/handler/PerformanceAnalyzerClusterSettingHandler.java

@@ -10,10 +10,10 @@ public class PerformanceAnalyzerClusterSettingHandler implements ClusterSettingL
     private static final int BIT_ONE = 1;
     private static final int CLUSTER_SETTING_DISABLED_VALUE = 0;
     private static final int ENABLED_VALUE = 1;
-    private static final int MAX_ALLOWED_BIT_POS = Math.min(PerformanceAnalyzerFeatureBits.values().length, Integer.SIZE - 1);
     private static final int RCA_ENABLED_BIT_POS = PerformanceAnalyzerFeatureBits.RCA_BIT.ordinal();
     private static final int PA_ENABLED_BIT_POS = PerformanceAnalyzerFeatureBits.PA_BIT.ordinal();
     private static final int LOGGING_ENABLED_BIT_POS = PerformanceAnalyzerFeatureBits.LOGGING_BIT.ordinal();
+    private static final int MAX_ALLOWED_BIT_POS = Math.min(PerformanceAnalyzerFeatureBits.values().length, Integer.SIZE - 1);
 
     private final PerformanceAnalyzerController controller;
     private final ClusterSettingsManager clusterSettingsManager;
@@ -219,7 +219,7 @@ private int resetBit(int number, int bitPosition) {
      * @param bitPosition The position of the bit in the clusterSettingValue
      * @return true if the bit is set, false otherwise.
      */
-    public static boolean checkBit(int clusterSettingValue, int bitPosition) {
-        return ((bitPosition < MAX_ALLOWED_BIT_POS) && (clusterSettingValue & (1 << bitPosition)) > 0);
+    private boolean checkBit(int clusterSettingValue, int bitPosition) {
+        return ((bitPosition < MAX_ALLOWED_BIT_POS) & (clusterSettingValue & (1 << bitPosition)) == ENABLED_VALUE);
     }
 }