eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m.@apache.org
Subject incubator-eagle git commit: fix typo in files
Date Thu, 28 Jul 2016 03:13:20 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/develop 8777936d2 -> 4d7ccd18e


fix typo in files


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/4d7ccd18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/4d7ccd18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/4d7ccd18

Branch: refs/heads/develop
Commit: 4d7ccd18e817ac65e81fe80ca992801b6ed90174
Parents: 8777936
Author: anyway1021 <mw@apache.org>
Authored: Thu Jul 28 11:12:46 2016 +0800
Committer: anyway1021 <mw@apache.org>
Committed: Thu Jul 28 11:12:46 2016 +0800

----------------------------------------------------------------------
 .../eagle-stream-pipeline/src/test/resources/pipeline_3.conf   | 2 +-
 .../eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java       | 2 +-
 .../eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java      | 2 +-
 .../src/main/resources/MRErrorCategory.config                  | 1 -
 .../eagle/jpm/spark/history/crawl/JHFSparkEventReader.java     | 6 ++++--
 .../eagle-jpm-util/src/main/resources/application.properties   | 2 +-
 .../security/hdfs/test/HDFSResourceAccessConfigTest.java       | 6 +++---
 .../service/security/pwdgen/PasswordEncoderGenerator.java      | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-core/eagle-data-process/eagle-stream-pipeline/src/test/resources/pipeline_3.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/eagle-stream-pipeline/src/test/resources/pipeline_3.conf
b/eagle-core/eagle-data-process/eagle-stream-pipeline/src/test/resources/pipeline_3.conf
index b1c1955..9dc7ce3 100644
--- a/eagle-core/eagle-data-process/eagle-stream-pipeline/src/test/resources/pipeline_3.conf
+++ b/eagle-core/eagle-data-process/eagle-stream-pipeline/src/test/resources/pipeline_3.conf
@@ -34,7 +34,7 @@
 			"site" : "sandbox"
 			"application": "HADOOP"
 			"dataJoinPollIntervalSec" : 30
-			"mailHost" : "atom.corp.ebay.com"
+			"mailHost" : "some.mail.server"
 			"mailSmtpPort":"25"
 			"mailDebug" : "true"
 			"eagleService": {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java
b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java
index f25fa20..f7cd5b4 100755
--- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java
+++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/crawler/SchedulerInfoCrawler.java
@@ -42,7 +42,7 @@ public class SchedulerInfoCrawler implements Runnable {
 	@Override
 	public void run() {
 		try {
-			//https://apollo-phx-rm-2.vip.ebay.com:50030/ws/v1/cluster/scheduler?anonymous=true
+			//https://some.server.address:50030/ws/v1/cluster/scheduler?anonymous=true
 			logger.info("Start to crawl cluster scheduler queues from " + this.urlString);
 			SchedulerWrapper schedulerWrapper = (SchedulerWrapper) HadoopYarnResourceUtils.getObjectFromStreamWithGzip(urlString,
SchedulerWrapper.class);
 			if (schedulerWrapper == null || schedulerWrapper.getScheduler() == null) {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
index 24e3563..7fe8909 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/parser/JHFMRVer1EventReader.java
@@ -85,7 +85,7 @@ public class JHFMRVer1EventReader extends JHFEventReaderBase implements
JHFMRVer
         String rack = null;
         // we get rack/hostname based on task's status
         if (values.get(Keys.TASK_STATUS).equals(EagleTaskStatus.SUCCESS.name())) {
-            // in CDH4.1.4, the hostname has the format of /default/rack128/phxdpehdc10dn0338.stratus.phx.ebay.com
+            // in CDH4.1.4, the hostname has the format of /default/rack128/some.server.address
             // if not specified, the hostname has the format  of /default-rack/<hostname>
             String decoratedHostname = values.get(Keys.HOSTNAME);
             String[] tmp = decoratedHostname.split("/");

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-jpm/eagle-jpm-mr-history/src/main/resources/MRErrorCategory.config
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/MRErrorCategory.config b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/MRErrorCategory.config
index ee8c0c5..de5072a 100644
--- a/eagle-jpm/eagle-jpm-mr-history/src/main/resources/MRErrorCategory.config
+++ b/eagle-jpm/eagle-jpm-mr-history/src/main/resources/MRErrorCategory.config
@@ -22,7 +22,6 @@ CONTAINER_KILLED_BY_APPMASTER = false|Container killed by the ApplicationMaster
 CONTAINER_CLEANUP_FAILURE = false|cleanup failed for container container_
 USER_NOT_FOUND = false|User \S+ not found
 TASK_TREE_BEYOND_MEMORY_LIMIT = false|^TaskTree \S+ is running beyond memory-limits
-EBAY_APPMON_LOG_GET_TRAVERSER = false|^Error: com.ebay.appmon.log.traverser.LogTraverser.getTraverser
 MAP_OUTPUT_LOST = false|Map output lost
 BEYOND_PHYSICAL_MEMORY_LIMITS = false|running beyond physical memory limits
 GC_OVERHEAD_LIMIT_EXCEEDED = false|GC overhead limit exceeded

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
index db5d432..99aa68d 100644
--- a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
+++ b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
@@ -110,7 +110,7 @@ public class JHFSparkEventReader {
 
         List<String> jobConfs = conf.getStringList("basic.jobConf.additional.info");
         String[] props = {"spark.yarn.app.id", "spark.executor.memory", "spark.driver.host",
"spark.driver.port",
-                "spark.driver.memory", "ebay.job.name", "spark.scheduler.pool", "spark.executor.cores",
"spark.yarn.am.memory",
+                "spark.driver.memory", "spark.scheduler.pool", "spark.executor.cores", "spark.yarn.am.memory",
                 "spark.yarn.am.cores", "spark.yarn.executor.memoryOverhead", "spark.yarn.driver.memoryOverhead",
"spark.yarn.am.memoryOverhead", "spark.master"};
         jobConfs.addAll(Arrays.asList(props));
         for (String prop : jobConfs) {
@@ -158,7 +158,9 @@ public class JHFSparkEventReader {
             entity.getTags().put(SparkJobTagName.SPARK_APP_ID.toString(), JSONUtil.getString(event,
"App ID"));
             entity.getTags().put(SparkJobTagName.SPARK_APP_NAME.toString(), JSONUtil.getString(event,
"App Name"));
             entity.getTags().put(SparkJobTagName.SPARK_APP_ATTEMPT_ID.toString(), JSONUtil.getString(event,
"App Attempt ID"));
-            entity.getTags().put(SparkJobTagName.SPARK_APP_NORM_NAME.toString(), this.getNormalizedName(JSONUtil.getString(event,
"App Name"), this.app.getConfig().getConfig().get("ebay.job.name")));
+            // the second argument of getNormalizeName() is changed to null because the original
code contains sensitive text
+            // original second argument looks like: this.app.getConfig().getConfig().get("xxx"),
"xxx" is the sensitive text
+            entity.getTags().put(SparkJobTagName.SPARK_APP_NORM_NAME.toString(), this.getNormalizedName(JSONUtil.getString(event,
"App Name"), null));
             entity.getTags().put(SparkJobTagName.SPARK_USER.toString(), JSONUtil.getString(event,
"User"));
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-jpm/eagle-jpm-util/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-util/src/main/resources/application.properties b/eagle-jpm/eagle-jpm-util/src/main/resources/application.properties
index d6f2a5b..b180a41 100644
--- a/eagle-jpm/eagle-jpm-util/src/main/resources/application.properties
+++ b/eagle-jpm/eagle-jpm-util/src/main/resources/application.properties
@@ -19,5 +19,5 @@
 #  */
 #
 
-### job name normalization rules, please refer to wiki https://wiki.vip.corp.ebay.com/display/DI/Job+name+normalization
+### job name normalization rules, please refer to wiki
 job.name.normalization.rules.key="^(.*)[0-9]{4}/[0-9]{2}/[0-9]{2}/[0-9]{2}$ => $1~ ; ^(oozie:launcher):T=(.*):W=(.*):A=(.*):ID=(?:.*)$
=> $1-$2-$3-$4~ ; ^(.*)([0-9]{10})$ => $1~ ; ^[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}$
=> uuid~ ; ^(.*)(?:[0-9]{8}/[0-9]{2}_[0-9]{2})$ => $1~"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-security/eagle-security-hdfs-web/src/test/java/org/apache/eagle/service/security/hdfs/test/HDFSResourceAccessConfigTest.java
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hdfs-web/src/test/java/org/apache/eagle/service/security/hdfs/test/HDFSResourceAccessConfigTest.java
b/eagle-security/eagle-security-hdfs-web/src/test/java/org/apache/eagle/service/security/hdfs/test/HDFSResourceAccessConfigTest.java
index bfc1df9..8ad7cc0 100644
--- a/eagle-security/eagle-security-hdfs-web/src/test/java/org/apache/eagle/service/security/hdfs/test/HDFSResourceAccessConfigTest.java
+++ b/eagle-security/eagle-security-hdfs-web/src/test/java/org/apache/eagle/service/security/hdfs/test/HDFSResourceAccessConfigTest.java
@@ -26,15 +26,15 @@ public class HDFSResourceAccessConfigTest {
 
 	@Test
 	public void testHDFSResourceAccessConfig() throws Exception {
-		String configStr = "{\"fs.defaultFS\":\"hdfs://sandbox-nn-ha\",\"dfs.nameservices\":\"sandbox-nn-ha\",\"dfs.ha.namenodes.sandbox-nn-ha\":\"nn1,nn2\",\"dfs.namenode.rpc-address.sandbox-nn-ha.nn1\":\"sandbox-nn.vip.ebay.com:8020\",\"dfs.namenode.rpc-address.sandbox-nn-ha.nn2\":\"sandbox-nn-2.vip.ebay.com:8020\",\"dfs.client.failover.proxy.provider.sandbox-nn-ha\":\"org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider\",\"hadoop.security.authentication\":\"kerberos\",\"dfs.namenode.kerberos.principal\":\"hadoop/_HOST@EXAMPLE.COM\"}";
+		String configStr = "{\"fs.defaultFS\":\"hdfs://sandbox-nn-ha\",\"dfs.nameservices\":\"sandbox-nn-ha\",\"dfs.ha.namenodes.sandbox-nn-ha\":\"nn1,nn2\",\"dfs.namenode.rpc-address.sandbox-nn-ha.nn1\":\"sandbox-nn.some.server.com:8020\",\"dfs.namenode.rpc-address.sandbox-nn-ha.nn2\":\"sandbox-nn-2.some.server.com:8020\",\"dfs.client.failover.proxy.provider.sandbox-nn-ha\":\"org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider\",\"hadoop.security.authentication\":\"kerberos\",\"dfs.namenode.kerberos.principal\":\"hadoop/_HOST@EXAMPLE.COM\"}";
 		ObjectMapper mapper = new ObjectMapper();
 		Map<String, String> configMap = mapper.readValue(configStr, Map.class);
 		Map<String, String> result = new HashMap<>();
 		result.put("fs.defaultFS" , "hdfs://sandbox-nn-ha");
 		result.put("dfs.nameservices", "sandbox-nn-ha");
 		result.put("dfs.ha.namenodes.sandbox-nn-ha", "nn1,nn2");
-		result.put("dfs.namenode.rpc-address.sandbox-nn-ha.nn1", "sandbox-nn.vip.ebay.com:8020");
-		result.put("dfs.namenode.rpc-address.sandbox-nn-ha.nn2", "sandbox-nn-2.vip.ebay.com:8020");
+		result.put("dfs.namenode.rpc-address.sandbox-nn-ha.nn1", "sandbox-nn.some.server.com:8020");
+		result.put("dfs.namenode.rpc-address.sandbox-nn-ha.nn2", "sandbox-nn-2.some.server.com:8020");
 		result.put("dfs.client.failover.proxy.provider.sandbox-nn-ha","org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider");
 		result.put("hadoop.security.authentication", "kerberos");
 		result.put("dfs.namenode.kerberos.principal", "hadoop/_HOST@EXAMPLE.COM");

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4d7ccd18/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
b/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
index 1a855e2..ffbdcc2 100644
--- a/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
+++ b/eagle-webservice/src/main/java/org/apache/eagle/service/security/pwdgen/PasswordEncoderGenerator.java
@@ -20,7 +20,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 public class PasswordEncoderGenerator {
     public static void main(String[] args) {
-        String password = "eagle@ebay.com";
+        String password = "eagle@fake.pwd";
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         String hashedPassword = passwordEncoder.encode(password);
         System.out.println(hashedPassword);


Mime
View raw message