You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ma...@apache.org on 2017/04/27 22:14:01 UTC
[26/26] incubator-metron git commit: METRON-861: Allow JVM args to be
passed to CLI utilities closes apache/incubator-metron#534
METRON-861: Allow JVM args to be passed to CLI utilities closes apache/incubator-metron#534
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/68bd6c52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/68bd6c52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/68bd6c52
Branch: refs/heads/Metron_0.4.0
Commit: 68bd6c52055b34460ff1823a31daae1f60985e1a
Parents: bf2528f
Author: cstella <ce...@gmail.com>
Authored: Thu Apr 27 12:23:52 2017 -0400
Committer: cstella <ce...@gmail.com>
Committed: Thu Apr 27 12:23:52 2017 -0400
----------------------------------------------------------------------
.../metron-maas-service/src/main/scripts/maas_deploy.sh | 1 +
.../metron-maas-service/src/main/scripts/maas_service.sh | 1 +
metron-platform/metron-common/src/main/scripts/stellar | 2 +-
.../metron-common/src/main/scripts/zk_load_configs.sh | 2 +-
.../metron-data-management/src/main/scripts/flatfile_loader.sh | 4 ++--
.../src/main/scripts/geo_enrichment_load.sh | 3 ++-
.../metron-enrichment/src/main/scripts/latency_summarizer.sh | 2 +-
.../metron-pcap-backend/src/main/scripts/pcap_inspector.sh | 2 +-
.../metron-pcap-backend/src/main/scripts/pcap_query.sh | 1 +
9 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-analytics/metron-maas-service/src/main/scripts/maas_deploy.sh
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-maas-service/src/main/scripts/maas_deploy.sh b/metron-analytics/metron-maas-service/src/main/scripts/maas_deploy.sh
index 1d0a9f0..e9d123b 100755
--- a/metron-analytics/metron-maas-service/src/main/scripts/maas_deploy.sh
+++ b/metron-analytics/metron-maas-service/src/main/scripts/maas_deploy.sh
@@ -31,6 +31,7 @@ export HBASE_HOME=${HBASE_HOME:-/usr/hdp/current/hbase-client}
export METRON_VERSION=${project.version}
export METRON_HOME=/usr/metron/$METRON_VERSION
export DM_JAR=metron-maas-service-$METRON_VERSION-uber.jar
+export HADOOP_OPTS="$HADOOP_OPTS $METRON_JVMFLAGS"
CP=$METRON_HOME/lib/$DM_JAR
HADOOP_CLASSPATH=$(echo $CP )
for jar in $(echo $HADOOP_CLASSPATH | sed 's/:/ /g');do
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-analytics/metron-maas-service/src/main/scripts/maas_service.sh
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-maas-service/src/main/scripts/maas_service.sh b/metron-analytics/metron-maas-service/src/main/scripts/maas_service.sh
index 75736c1..a2c8ac2 100755
--- a/metron-analytics/metron-maas-service/src/main/scripts/maas_service.sh
+++ b/metron-analytics/metron-maas-service/src/main/scripts/maas_service.sh
@@ -31,6 +31,7 @@ export HBASE_HOME=${HBASE_HOME:-/usr/hdp/current/hbase-client}
export METRON_VERSION=${project.version}
export METRON_HOME=/usr/metron/$METRON_VERSION
export DM_JAR=metron-maas-service-$METRON_VERSION-uber.jar
+export HADOOP_OPTS="$HADOOP_OPTS $METRON_JVMFLAGS"
CP=$METRON_HOME/lib/$DM_JAR
HADOOP_CLASSPATH=$(echo $CP )
for jar in $(echo $HADOOP_CLASSPATH | sed 's/:/ /g');do
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-platform/metron-common/src/main/scripts/stellar
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/scripts/stellar b/metron-platform/metron-common/src/main/scripts/stellar
index 8cc48c9..2145350 100644
--- a/metron-platform/metron-common/src/main/scripts/stellar
+++ b/metron-platform/metron-common/src/main/scripts/stellar
@@ -31,4 +31,4 @@ fi
export HBASE_CONFIGS=/etc/hbase/conf
export METRON_VERSION=${project.version}
export METRON_HOME=/usr/metron/$METRON_VERSION
-java -cp "$HBASE_CONFIGS:$METRON_HOME/lib/*" org.apache.metron.common.stellar.shell.StellarShell "$@"
+java $JVMFLAGS -cp "$HBASE_CONFIGS:$METRON_HOME/lib/*" org.apache.metron.common.stellar.shell.StellarShell "$@"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-platform/metron-common/src/main/scripts/zk_load_configs.sh
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/scripts/zk_load_configs.sh b/metron-platform/metron-common/src/main/scripts/zk_load_configs.sh
index 39e5e3e..2380d13 100755
--- a/metron-platform/metron-common/src/main/scripts/zk_load_configs.sh
+++ b/metron-platform/metron-common/src/main/scripts/zk_load_configs.sh
@@ -33,5 +33,5 @@ export JAR=metron-parsers-$METRON_VERSION-uber.jar
export HBASE_HOME=${HBASE_HOME:-/usr/hdp/current/hbase-client}
CP=$METRON_HOME/lib/$JAR:${HBASE_HOME}/lib/hbase-server.jar:`${HBASE_HOME}/bin/hbase classpath`
-java -cp $CP $CLASSNAME "$@"
+java $METRON_JVMFLAGS -cp $CP $CLASSNAME "$@"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-platform/metron-data-management/src/main/scripts/flatfile_loader.sh
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/scripts/flatfile_loader.sh b/metron-platform/metron-data-management/src/main/scripts/flatfile_loader.sh
index b9e2746..f92d418 100755
--- a/metron-platform/metron-data-management/src/main/scripts/flatfile_loader.sh
+++ b/metron-platform/metron-data-management/src/main/scripts/flatfile_loader.sh
@@ -32,7 +32,7 @@ export METRON_HOME=/usr/metron/$METRON_VERSION
export CLASSNAME="org.apache.metron.dataloads.nonbulk.flatfile.SimpleEnrichmentFlatFileLoader"
export DM_JAR=${project.artifactId}-$METRON_VERSION.jar
export HBASE_HOME=${HBASE_HOME:-/usr/hdp/current/hbase-client}
-
+export HADOOP_OPTS="$HADOOP_OPTS $METRON_JVMFLAGS"
if [ $(which hadoop) ]
then
HADOOP_CLASSPATH=${HBASE_HOME}/lib/hbase-server.jar:`${HBASE_HOME}/bin/hbase classpath`
@@ -46,6 +46,6 @@ then
else
echo "Warning: Metron cannot find the hadoop client on this node. This means that loading via Map Reduce will NOT function."
CP=$METRON_HOME/lib/$DM_JAR:/usr/metron/${METRON_VERSION}/lib/taxii-1.1.0.1.jar:`${HBASE_HOME}/bin/hbase classpath`
- java -cp $CP $CLASSNAME "$@"
+ java $METRON_JVMFLAGS -cp $CP $CLASSNAME "$@"
fi
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-platform/metron-data-management/src/main/scripts/geo_enrichment_load.sh
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/scripts/geo_enrichment_load.sh b/metron-platform/metron-data-management/src/main/scripts/geo_enrichment_load.sh
index 3b6ab37..a2d5448 100644
--- a/metron-platform/metron-data-management/src/main/scripts/geo_enrichment_load.sh
+++ b/metron-platform/metron-data-management/src/main/scripts/geo_enrichment_load.sh
@@ -38,4 +38,5 @@ export HADOOP_CLASSPATH
export METRON_VERSION=${project.version}
export METRON_HOME=/usr/metron/$METRON_VERSION
export DM_JAR=${project.artifactId}-$METRON_VERSION.jar
-hadoop jar $METRON_HOME/lib/$DM_JAR org.apache.metron.dataloads.nonbulk.geo.GeoEnrichmentLoader "$@"
\ No newline at end of file
+export HADOOP_OPTS="$HADOOP_OPTS $METRON_JVMFLAGS"
+hadoop jar $METRON_HOME/lib/$DM_JAR org.apache.metron.dataloads.nonbulk.geo.GeoEnrichmentLoader "$@"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-platform/metron-enrichment/src/main/scripts/latency_summarizer.sh
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/scripts/latency_summarizer.sh b/metron-platform/metron-enrichment/src/main/scripts/latency_summarizer.sh
index ea92c61..8d20a48 100755
--- a/metron-platform/metron-enrichment/src/main/scripts/latency_summarizer.sh
+++ b/metron-platform/metron-enrichment/src/main/scripts/latency_summarizer.sh
@@ -29,4 +29,4 @@ fi
export METRON_VERSION=${project.version}
export METRON_HOME=/usr/metron/$METRON_VERSION
export TOPOLOGIES_JAR=Metron-Topologies-$METRON_VERSION.jar
-java -cp $METRON_HOME/lib/$TOPOLOGIES_JAR org.apache.metron.enrichment.cli.LatencySummarizer "$@"
+java $METRON_JVMFLAGS -cp $METRON_HOME/lib/$TOPOLOGIES_JAR org.apache.metron.enrichment.cli.LatencySummarizer "$@"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-platform/metron-pcap-backend/src/main/scripts/pcap_inspector.sh
----------------------------------------------------------------------
diff --git a/metron-platform/metron-pcap-backend/src/main/scripts/pcap_inspector.sh b/metron-platform/metron-pcap-backend/src/main/scripts/pcap_inspector.sh
index a5a24ae..438152c 100755
--- a/metron-platform/metron-pcap-backend/src/main/scripts/pcap_inspector.sh
+++ b/metron-platform/metron-pcap-backend/src/main/scripts/pcap_inspector.sh
@@ -30,5 +30,5 @@ fi
export METRON_VERSION=${project.version}
export METRON_HOME=/usr/metron/$METRON_VERSION
export TOPOLOGIES_JAR=${project.artifactId}-$METRON_VERSION.jar
-
+export HADOOP_OPTS="$HADOOP_OPTS $METRON_JVMFLAGS"
yarn jar $METRON_HOME/lib/$TOPOLOGIES_JAR org.apache.metron.utils.PcapInspector "$@"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/68bd6c52/metron-platform/metron-pcap-backend/src/main/scripts/pcap_query.sh
----------------------------------------------------------------------
diff --git a/metron-platform/metron-pcap-backend/src/main/scripts/pcap_query.sh b/metron-platform/metron-pcap-backend/src/main/scripts/pcap_query.sh
index c09aa03..206e2b8 100755
--- a/metron-platform/metron-pcap-backend/src/main/scripts/pcap_query.sh
+++ b/metron-platform/metron-pcap-backend/src/main/scripts/pcap_query.sh
@@ -30,5 +30,6 @@ fi
export METRON_VERSION=${project.version}
export METRON_HOME=/usr/metron/$METRON_VERSION
export PCAP_BACKEND_JAR=${project.artifactId}-$METRON_VERSION.jar
+export HADOOP_OPTS="$HADOOP_OPTS $METRON_JVMFLAGS"
yarn jar $METRON_HOME/lib/$PCAP_BACKEND_JAR org.apache.metron.pcap.query.PcapCli "$@"