From 8888029e9a89c85e2dc0493286c4d5a562e748c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= <wu.sheng@foxmail.com>
Date: Sat, 17 Aug 2019 10:10:30 +0800
Subject: [PATCH] Module config set override is not working (#3283)

* set Override is not working.

* Submodule update

* Add header.
---
 .../StorageModuleElasticsearchConfig.java     | 21 +++++++++++++++----
 skywalking-ui                                 |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java
index 5ba66929c..e8a0fc66b 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java
@@ -47,11 +47,24 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig {
     private int otherMetricsDataTTL = 0;
     @Setter private int monthMetricsDataTTL = 18;
 
-    public void setOtherMetricsDataTTL(int otherMetricsDataTTL) {
+    public int getMinuteMetricsDataTTL() {
         if (otherMetricsDataTTL > 0) {
-            minuteMetricsDataTTL = otherMetricsDataTTL;
-            hourMetricsDataTTL = otherMetricsDataTTL;
-            dayMetricsDataTTL = otherMetricsDataTTL;
+            return otherMetricsDataTTL;
         }
+        return minuteMetricsDataTTL;
+    }
+
+    public int getHourMetricsDataTTL() {
+        if (otherMetricsDataTTL > 0) {
+            return otherMetricsDataTTL;
+        }
+        return hourMetricsDataTTL;
+    }
+
+    public int getDayMetricsDataTTL() {
+        if (otherMetricsDataTTL > 0) {
+            return otherMetricsDataTTL;
+        }
+        return dayMetricsDataTTL;
     }
 }
diff --git a/skywalking-ui b/skywalking-ui
index 3e78e9cc1..17040efd7 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 3e78e9cc16f1749ef3a4deb9598394357d8b161d
+Subproject commit 17040efd79a973b6a3c84a70b1a401cd92ff9ba4