From 55c33c6dec672a6ac9f4d05dd3c41d4272301f04 Mon Sep 17 00:00:00 2001 From: asdf2014 <1571805553@qq.com> Date: Wed, 7 Jun 2017 12:01:53 +0800 Subject: [PATCH] [MINOR] Fxi sprk/egle issues in JPM module --- .../java/org/apache/eagle/jpm/spark/entity/SparkApp.java | 6 +++--- .../org/apache/eagle/jpm/spark/entity/SparkExecutor.java | 6 +++--- .../java/org/apache/eagle/jpm/spark/entity/SparkJob.java | 6 +++--- .../org/apache/eagle/jpm/spark/entity/SparkStage.java | 6 +++--- .../java/org/apache/eagle/jpm/spark/entity/SparkTask.java | 6 +++--- .../java/org/apache/eagle/jpm/util/SparkJobTagName.java | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkApp.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkApp.java index b08833ef31..dc64cd90b5 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkApp.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkApp.java @@ -23,13 +23,13 @@ import org.apache.eagle.log.entity.meta.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -@Table("eglesprk_apps") +@Table("eagle_spark_apps") @ColumnFamily("f") -@Prefix("sprkapp") +@Prefix("sparkapp") @Service(Constants.SPARK_APP_SERVICE_ENDPOINT_NAME) @JsonIgnoreProperties(ignoreUnknown = true) @TimeSeries(true) -@Tags({"site","sprkAppId", "sprkAppAttemptId", "sprkAppName", "normSprkAppName","user", "queue"}) +@Tags({"site","sparkAppId", "sparkAppAttemptId", "sparkAppName", "normsparkAppName","user", "queue"}) @Partition({"site"}) public class SparkApp extends TaggedLogAPIEntity { diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkExecutor.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkExecutor.java index f3b6a9a3e0..b9824e90df 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkExecutor.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkExecutor.java @@ -23,13 +23,13 @@ import org.apache.eagle.log.entity.meta.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -@Table("eglesprk_executors") +@Table("eagle_spark_executors") @ColumnFamily("f") -@Prefix("sprkexcutr") +@Prefix("sparkexcutr") @Service(Constants.SPARK_EXECUTOR_SERVICE_ENDPOINT_NAME) @JsonIgnoreProperties(ignoreUnknown = true) @TimeSeries(true) -@Tags({"site","sprkAppId", "sprkAppAttemptId", "sprkAppName", "normSprkAppName", "executorId","user", "queue"}) +@Tags({"site","sparkAppId", "sparkAppAttemptId", "sparkAppName", "normsparkAppName", "executorId","user", "queue"}) @Partition({"site"}) public class SparkExecutor extends TaggedLogAPIEntity { diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkJob.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkJob.java index 625f190242..5a48998b77 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkJob.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkJob.java @@ -23,13 +23,13 @@ import org.apache.eagle.log.entity.meta.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -@Table("eglesprk_jobs") +@Table("eagle_spark_jobs") @ColumnFamily("f") -@Prefix("sprkjob") +@Prefix("sparkjob") @Service(Constants.SPARK_JOB_SERVICE_ENDPOINT_NAME) @JsonIgnoreProperties(ignoreUnknown = true) @TimeSeries(true) -@Tags({"site","sprkAppId", "sprkAppAttemptId", "sprkAppName", "normSprkAppName", "jobId","user", "queue"}) +@Tags({"site","sparkAppId", "sparkAppAttemptId", "sparkAppName", "normsparkAppName", "jobId","user", "queue"}) @Partition({"site"}) public class SparkJob extends TaggedLogAPIEntity { diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkStage.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkStage.java index 9a4e67e8d1..2d7d580c6f 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkStage.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkStage.java @@ -23,13 +23,13 @@ import org.apache.eagle.log.entity.meta.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -@Table("eglesprk_stages") +@Table("eagle_spark_stages") @ColumnFamily("f") -@Prefix("sprkstage") +@Prefix("sparkstage") @Service(Constants.SPARK_STAGE_SERVICE_ENDPOINT_NAME) @JsonIgnoreProperties(ignoreUnknown = true) @TimeSeries(true) -@Tags({"site","sprkAppId", "sprkAppAttemptId", "sprkAppName", "normSprkAppName", "jobId", "stageId","stageAttemptId","user", "queue"}) +@Tags({"site","sparkAppId", "sparkAppAttemptId", "sparkAppName", "normsparkAppName", "jobId", "stageId","stageAttemptId","user", "queue"}) @Partition({"site"}) public class SparkStage extends TaggedLogAPIEntity { diff --git a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkTask.java b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkTask.java index 583864585d..7634af4f96 100644 --- a/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkTask.java +++ b/eagle-jpm/eagle-jpm-entity/src/main/java/org/apache/eagle/jpm/spark/entity/SparkTask.java @@ -23,13 +23,13 @@ import org.apache.eagle.log.entity.meta.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -@Table("eglesprk_tasks") +@Table("eagle_spark_tasks") @ColumnFamily("f") -@Prefix("sprktask") +@Prefix("sparktask") @Service(Constants.SPARK_TASK_SERVICE_ENDPOINT_NAME) @JsonIgnoreProperties(ignoreUnknown = true) @TimeSeries(true) -@Tags({"site","sprkAppId", "sprkAppAttemptId", "sprkAppName", "normSprkAppName", "jobId", "jobName", "stageId","stageAttemptId","taskIndex","taskAttemptId","user", "queue"}) +@Tags({"site","sparkAppId", "sparkAppAttemptId", "sparkAppName", "normsparkAppName", "jobId", "jobName", "stageId","stageAttemptId","taskIndex","taskAttemptId","user", "queue"}) @Partition({"site"}) public class SparkTask extends TaggedLogAPIEntity { diff --git a/eagle-jpm/eagle-jpm-util/src/main/java/org/apache/eagle/jpm/util/SparkJobTagName.java b/eagle-jpm/eagle-jpm-util/src/main/java/org/apache/eagle/jpm/util/SparkJobTagName.java index f403332a4b..8f5440f908 100644 --- a/eagle-jpm/eagle-jpm-util/src/main/java/org/apache/eagle/jpm/util/SparkJobTagName.java +++ b/eagle-jpm/eagle-jpm-util/src/main/java/org/apache/eagle/jpm/util/SparkJobTagName.java @@ -19,10 +19,10 @@ public enum SparkJobTagName { SITE("site"), - SPARK_APP_ID("sprkAppId"), - SPARK_APP_ATTEMPT_ID("sprkAppAttemptId"), - SPARK_APP_NAME("sprkAppName"), - SPARK_APP_NORM_NAME("normSprkAppName"), + SPARK_APP_ID("sparkAppId"), + SPARK_APP_ATTEMPT_ID("sparkAppAttemptId"), + SPARK_APP_NAME("sparkAppName"), + SPARK_APP_NORM_NAME("normsparkAppName"), SPARK_JOB_ID("jobId"), SPARK_SATGE_ID("stageId"), SPARK_STAGE_ATTEMPT_ID("stageAttemptId"),