瀏覽代碼

AMBARI-13926. AMS log file not getting updated or created on fresh deploy. (Aravindan Vijayan via swagle)

Siddharth Wagle 9 年之前
父節點
當前提交
6ddab1b01a
共有 20 個文件被更改,包括 19 次插入10 次删除
  1. 2 0
      ambari-metrics/ambari-metrics-timelineservice/pom.xml
  2. 1 1
      ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AMSJMeterLoadTest.java
  3. 1 1
      ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AppGetMetric.java
  4. 1 1
      ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/GetMetricRequestInfo.java
  5. 13 6
      ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/JmeterTestPlanTask.java
  6. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/README
  7. 1 1
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/ams-jmeter.properties
  8. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/amsJmeterGraph.jmx
  9. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/jmeter.properties
  10. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/saveservice.properties
  11. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
  12. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/DATANODE.dat
  13. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/FLUME_HANDLER.dat
  14. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
  15. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HOST.dat
  16. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/KAFKA_BROKER.dat
  17. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
  18. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
  19. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NODEMANAGER.dat
  20. 0 0
      ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/RESOURCEMANAGER.dat

+ 2 - 0
ambari-metrics/ambari-metrics-timelineservice/pom.xml

@@ -434,6 +434,7 @@
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter_core</artifactId>
       <version>2.13</version>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
@@ -453,6 +454,7 @@
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter_http</artifactId>
       <version>2.13</version>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>

+ 1 - 1
ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/AMSJMeterLoadTest.java → ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AMSJMeterLoadTest.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest;
+package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest.jmetertest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.MetricsLoadSimulator;

+ 1 - 1
ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/AppGetMetric.java → ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AppGetMetric.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest;
+package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest.jmetertest;
 
 import java.util.List;
 

+ 1 - 1
ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/GetMetricRequestInfo.java → ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/GetMetricRequestInfo.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest;
+package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest.jmetertest;
 
 import org.apache.commons.lang.StringUtils;
 

+ 13 - 6
ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/JmeterTestPlanTask.java → ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/JmeterTestPlanTask.java

@@ -6,16 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest;
+package org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest.jmetertest;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.control.LoopController;
@@ -34,9 +34,16 @@ import org.apache.jorphan.collections.HashTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
 
 public class JmeterTestPlanTask implements Runnable {
 

+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/loadsimulator/README → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/README


+ 1 - 1
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/loadsimulator/ams-jmeter.properties → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/ams-jmeter.properties

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 #AMS information
-ams-host-port=104.196.94.27:6188
+ams-host-port=c6402.ambari.apache.org:6188
 ams-path=/ws/v1/timeline/metrics
 
 # Host Information, using the host-prefix, num-hosts and <MASTER>-host

+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/loadsimulator/amsJmeterGraph.jmx → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/amsJmeterGraph.jmx


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/loadsimulator/jmeter.properties → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/jmeter.properties


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/loadsimulator/saveservice.properties → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/saveservice.properties


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/AMS-HBASE.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/DATANODE.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/DATANODE.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/FLUME_HANDLER.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/FLUME_HANDLER.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/HBASE.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/HOST.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HOST.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/KAFKA_BROKER.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/KAFKA_BROKER.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/NAMENODE.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/NIMBUS.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/NODEMANAGER.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NODEMANAGER.dat


+ 0 - 0
ambari-metrics/ambari-metrics-timelineservice/src/main/resources/ui_metrics_def/RESOURCEMANAGER.dat → ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/RESOURCEMANAGER.dat