You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2016/10/19 03:27:22 UTC

[07/50] incubator-eagle git commit: [MINOR] Update HdfsAuditLogAppProvider.xml

[MINOR] Update HdfsAuditLogAppProvider.xml

Author: Zhao, Qingwen <qi...@ebay.com>

Closes #488 from qingwen220/hdfsAuditLog.


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

Branch: refs/heads/master
Commit: 9205433bccefd1b8e477dc09ef7e7ef5ae15ab41
Parents: 36df3ee
Author: Zhao, Qingwen <qi...@apache.org>
Authored: Tue Oct 11 09:55:14 2016 +0800
Committer: Zhao, Qingwen <qi...@ebay.com>
Committed: Tue Oct 11 09:55:14 2016 +0800

----------------------------------------------------------------------
 .../environment/impl/StormExecutionRuntime.java   |  2 +-
 ....security.auditlog.HdfsAuditLogAppProvider.xml | 18 +++++++++++++++---
 .../src/main/resources/application.conf           |  1 -
 3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9205433b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java
index 9821660..1994e28 100644
--- a/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java
+++ b/eagle-core/eagle-app/eagle-app-base/src/main/java/org/apache/eagle/app/environment/impl/StormExecutionRuntime.java
@@ -157,7 +157,7 @@ public class StormExecutionRuntime implements ExecutionRuntime<StormEnvironment,
     @Override
     public ApplicationEntity.Status status(Application<StormEnvironment, StormTopology> executor, com.typesafe.config.Config config) {
         String appId = config.getString("appId");
-        LOG.info("Fetching status of topology {} ..." + appId);
+        LOG.info("Fetching status of topology {} ...", appId);
         List<TopologySummary> topologySummaries ;
         try {
             if (Objects.equals(config.getString("mode"), ApplicationEntity.Mode.CLUSTER.name())) {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9205433b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
index cd564df..625a3a7 100644
--- a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
+++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/META-INF/providers/org.apache.eagle.security.auditlog.HdfsAuditLogAppProvider.xml
@@ -27,6 +27,12 @@
     <configuration>
         <!-- topology related configurations -->
         <property>
+            <name>workers</name>
+            <displayName>workers</displayName>
+            <value>1</value>
+            <description>number of topology workers</description>
+        </property>
+        <property>
             <name>topology.numOfSpoutTasks</name>
             <displayName>topology.numOfSpoutTasks</displayName>
             <value>2</value>
@@ -39,10 +45,16 @@
             <description>number of parser tasks</description>
         </property>
         <property>
-            <name>topology.numOfJoinTasks</name>
-            <displayName>topology.numOfJoinTasks</displayName>
+            <name>topology.numOfSensitivityJoinTasks</name>
+            <displayName>topology.numOfSensitivityJoinTasks</displayName>
+            <value>2</value>
+            <description>number of sensitivity join tasks</description>
+        </property>
+        <property>
+            <name>topology.numOfIPZoneJoinTasks</name>
+            <displayName>topology.numOfIPZoneJoinTasks</displayName>
             <value>2</value>
-            <description>number of external join tasks</description>
+            <description>number of ip zone join tasks</description>
         </property>
         <property>
             <name>topology.numOfSinkTasks</name>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/9205433b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf
index ed4609d..c8bbcb1 100644
--- a/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf
+++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/resources/application.conf
@@ -18,7 +18,6 @@
   "mode" : "LOCAL",
   "siteId" : "testsite",
   "topology" : {
-    "numOfTotalWorkers" : 2,
     "numOfSpoutTasks" : 2,
     "numOfParserTasks" : 2,
     "numOfSensitivityJoinTasks" : 2,