Fix for get detector API (#290)

We didn't return after sending back channel responses after one recent change. Later, when we use the channel to send back responses again, we get " java.lang.IllegalStateException: Channel is already closed". This PR fixes this issue. This PR also removes an redundant setting.
opendistro-for-elasticsearch · Oct 23, 2020 · d1c54e5 · d1c54e5
1 parent 6138f78
commit d1c54e5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorPlugin.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorPlugin.java
@@ -572,7 +572,6 @@ public List<Setting<?>> getSettings() {
                 AnomalyDetectorSettings.DETECTION_WINDOW_DELAY,
                 AnomalyDetectorSettings.AD_RESULT_HISTORY_ROLLOVER_PERIOD,
                 AnomalyDetectorSettings.AD_RESULT_HISTORY_MAX_DOCS,
-                AnomalyDetectorSettings.AD_RESULT_ROLLOVER_PERIOD,
                 AnomalyDetectorSettings.MAX_RETRY_FOR_UNRESPONSIVE_NODE,
                 AnomalyDetectorSettings.COOLDOWN_MINUTES,
                 AnomalyDetectorSettings.BACKOFF_MINUTES,

diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java
@@ -65,14 +65,6 @@ private AnomalyDetectorSettings() {}
             Setting.Property.Dynamic
         );
 
-    public static final Setting<TimeValue> AD_RESULT_ROLLOVER_PERIOD = Setting
-        .positiveTimeSetting(
-            "opendistro.anomaly_detection.ad_result_rollover_period",
-            TimeValue.timeValueHours(12),
-            Setting.Property.NodeScope,
-            Setting.Property.Dynamic
-        );
-
     public static final Setting<TimeValue> AD_RESULT_HISTORY_ROLLOVER_PERIOD = Setting
         .positiveTimeSetting(
             "opendistro.anomaly_detection.ad_result_history_rollover_period",

diff --git a/...com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportAction.java b/...com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportAction.java
@@ -163,6 +163,7 @@ public void onResponse(MultiGetResponse multiGetResponse) {
                                 .onFailure(
                                     new ElasticsearchStatusException("Can't find detector with id:  " + detectorId, RestStatus.NOT_FOUND)
                                 );
+                            return;
                         }
                         id = response.getId();
                         version = response.getResponse().getVersion();