Browse Source

YARN-5572. HBaseTimelineWriterImpl appears to reference a bad property name. Contributed by Varun Saxena.

Naganarasimha 8 years ago
parent
commit
c06114d6a3
8 changed files with 21 additions and 26 deletions
  1. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
  2. 2 2
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/DataGeneratorForTest.java
  3. 4 4
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
  4. 3 3
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
  5. 3 3
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java
  6. 7 7
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRun.java
  7. 1 1
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRunCompaction.java
  8. 0 5
      hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java

@@ -334,7 +334,7 @@ public class TestTimelineReaderWebServicesHBaseStorage {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, flowVersion, runid, entity.getId(), te);
       hbi.write(cluster, user, flow, flowVersion, runid, entity.getId(), te);
       hbi.write(cluster, user, flow, flowVersion, runid, entity1.getId(), te1);
       hbi.write(cluster, user, flow, flowVersion, runid, entity1.getId(), te1);

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/DataGeneratorForTest.java

@@ -182,7 +182,7 @@ final class DataGeneratorForTest {
     te2.addEntity(entity2);
     te2.addEntity(entity2);
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(util.getConfiguration());
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(util.getConfiguration());
       hbi.init(util.getConfiguration());
       hbi.start();
       hbi.start();
       String cluster = "cluster1";
       String cluster = "cluster1";
@@ -360,7 +360,7 @@ final class DataGeneratorForTest {
     te.addEntity(entity2);
     te.addEntity(entity2);
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(util.getConfiguration());
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(util.getConfiguration());
       hbi.init(util.getConfiguration());
       hbi.start();
       hbi.start();
       String cluster = "cluster1";
       String cluster = "cluster1";

+ 4 - 4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java

@@ -155,7 +155,7 @@ public class TestHBaseTimelineStorageApps {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
       Configuration c1 = util.getConfiguration();
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.start();
       hbi.start();
       String cluster = "cluster_check_null_application";
       String cluster = "cluster_check_null_application";
@@ -275,7 +275,7 @@ public class TestHBaseTimelineStorageApps {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
       Configuration c1 = util.getConfiguration();
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.start();
       hbi.start();
       String cluster = "cluster_test_write_app";
       String cluster = "cluster_test_write_app";
@@ -502,7 +502,7 @@ public class TestHBaseTimelineStorageApps {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
       Configuration c1 = util.getConfiguration();
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.start();
       hbi.start();
       String cluster = "cluster_test_events";
       String cluster = "cluster_test_events";
@@ -620,7 +620,7 @@ public class TestHBaseTimelineStorageApps {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
       Configuration c1 = util.getConfiguration();
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.start();
       hbi.start();
       // Writing application entity.
       // Writing application entity.

+ 3 - 3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java

@@ -194,7 +194,7 @@ public class TestHBaseTimelineStorageEntities {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
       Configuration c1 = util.getConfiguration();
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.start();
       hbi.start();
       String cluster = "cluster_test_write_entity";
       String cluster = "cluster_test_write_entity";
@@ -391,7 +391,7 @@ public class TestHBaseTimelineStorageEntities {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
       Configuration c1 = util.getConfiguration();
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.start();
       hbi.start();
       String cluster = "cluster_test_empty_eventkey";
       String cluster = "cluster_test_empty_eventkey";
@@ -496,7 +496,7 @@ public class TestHBaseTimelineStorageEntities {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     try {
     try {
       Configuration c1 = util.getConfiguration();
       Configuration c1 = util.getConfiguration();
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.start();
       hbi.start();
       String cluster = "clus!ter_\ttest_ev  ents";
       String cluster = "clus!ter_\ttest_ev  ents";

+ 3 - 3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowActivity.java

@@ -119,7 +119,7 @@ public class TestHBaseStorageFlowActivity {
         .getEntityMinStartTime(minStartTs);
         .getEntityMinStartTime(minStartTs);
 
 
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
 
 
@@ -228,7 +228,7 @@ public class TestHBaseStorageFlowActivity {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       String appName = "application_1111999999_1234";
       String appName = "application_1111999999_1234";
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
@@ -341,7 +341,7 @@ public class TestHBaseStorageFlowActivity {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       String appName = "application_11888888888_1111";
       String appName = "application_11888888888_1111";
       hbi.write(cluster, user, flow, flowVersion1, runid1, appName, te);
       hbi.write(cluster, user, flow, flowVersion1, runid1, appName, te);

+ 7 - 7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRun.java

@@ -184,7 +184,7 @@ public class TestHBaseStorageFlowRun {
         .getEntityMinStartTime(minStartTs);
         .getEntityMinStartTime(minStartTs);
 
 
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
 
 
@@ -290,7 +290,7 @@ public class TestHBaseStorageFlowRun {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       String appName = "application_11111111111111_1111";
       String appName = "application_11111111111111_1111";
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
@@ -559,7 +559,7 @@ public class TestHBaseStorageFlowRun {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       String appName = "application_11111111111111_1111";
       String appName = "application_11111111111111_1111";
       hbi.write(cluster, user, flow, flowVersion, 1002345678919L, appName, te);
       hbi.write(cluster, user, flow, flowVersion, 1002345678919L, appName, te);
@@ -644,7 +644,7 @@ public class TestHBaseStorageFlowRun {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       String appName = "application_11111111111111_1111";
       String appName = "application_11111111111111_1111";
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
       hbi.write(cluster, user, flow, flowVersion, runid, appName, te);
@@ -737,7 +737,7 @@ public class TestHBaseStorageFlowRun {
     TimelineEntity entityApp1 = null;
     TimelineEntity entityApp1 = null;
     TimelineEntity entityApp2 = null;
     TimelineEntity entityApp2 = null;
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
 
 
       for (int i = start; i < count; i++) {
       for (int i = start; i < count; i++) {
@@ -826,7 +826,7 @@ public class TestHBaseStorageFlowRun {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, "CF7022C10F1354", 1002345678919L,
       hbi.write(cluster, user, flow, "CF7022C10F1354", 1002345678919L,
           "application_11111111111111_1111", te);
           "application_11111111111111_1111", te);
@@ -908,7 +908,7 @@ public class TestHBaseStorageFlowRun {
     HBaseTimelineWriterImpl hbi = null;
     HBaseTimelineWriterImpl hbi = null;
     Configuration c1 = util.getConfiguration();
     Configuration c1 = util.getConfiguration();
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       hbi.write(cluster, user, flow, "CF7022C10F1354", 1002345678919L,
       hbi.write(cluster, user, flow, "CF7022C10F1354", 1002345678919L,
           "application_11111111111111_1111", te);
           "application_11111111111111_1111", te);

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/TestHBaseStorageFlowRunCompaction.java

@@ -287,7 +287,7 @@ public class TestHBaseStorageFlowRunCompaction {
     TimelineEntities te1 = null;
     TimelineEntities te1 = null;
     TimelineEntity entityApp1 = null;
     TimelineEntity entityApp1 = null;
     try {
     try {
-      hbi = new HBaseTimelineWriterImpl(c1);
+      hbi = new HBaseTimelineWriterImpl();
       hbi.init(c1);
       hbi.init(c1);
       // now insert count * ( 100 + 100) metrics
       // now insert count * ( 100 + 100) metrics
       // each call to getEntityMetricsApp1 brings back 100 values
       // each call to getEntityMetricsApp1 brings back 100 values

+ 0 - 5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java

@@ -101,11 +101,6 @@ public class HBaseTimelineWriterImpl extends AbstractService implements
     super(HBaseTimelineWriterImpl.class.getName());
     super(HBaseTimelineWriterImpl.class.getName());
   }
   }
 
 
-  public HBaseTimelineWriterImpl(Configuration conf) throws IOException {
-    super(conf.get("yarn.application.id",
-        HBaseTimelineWriterImpl.class.getName()));
-  }
-
   /**
   /**
    * initializes the hbase connection to write to the entity table.
    * initializes the hbase connection to write to the entity table.
    */
    */