Repository: incubator-gearpump Updated Branches: refs/heads/master c9b2cea81 -> ffb3d8c91
[GEARPUMP-236] Upgrade sbt-assembly version to fix java.lang.VerifyError Author: karol brejna <[email protected]> Closes #157 from karol-brejna-i/GEARPUMP-236. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/ffb3d8c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/ffb3d8c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/ffb3d8c9 Branch: refs/heads/master Commit: ffb3d8c91525a39ffc54cfc204b7c517a7e03144 Parents: c9b2cea Author: karol brejna <[email protected]> Authored: Thu Feb 23 20:34:17 2017 +0800 Committer: manuzhang <[email protected]> Committed: Thu Feb 23 20:34:35 2017 +0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/gearpump/util/Util.scala | 9 ++------- .../gearpump/experiments/yarn/appmaster/Command.scala | 4 ++-- .../experiments/yarn/client/LaunchClusterSpec.scala | 4 ++-- project/Pack.scala | 7 ------- project/plugins.sbt | 2 +- 5 files changed, 7 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ffb3d8c9/core/src/main/scala/org/apache/gearpump/util/Util.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/util/Util.scala b/core/src/main/scala/org/apache/gearpump/util/Util.scala index 8ee0e26..cc95df1 100644 --- a/core/src/main/scala/org/apache/gearpump/util/Util.scala +++ b/core/src/main/scala/org/apache/gearpump/util/Util.scala @@ -67,13 +67,8 @@ object Util { arguments: Array[String]): RichProcess = { val java = System.getProperty("java.home") + "/bin/java" - val command = List(java) ++ - // java.lang.VerifyError will be caused without "-noverify" - // TODO: investigate the cause and remove this - Array("-noverify") ++ - options ++ - List("-cp", classPath.mkString(File.pathSeparator), mainClass) ++ - arguments + val command = List(java) ++ options ++ + List("-cp", classPath.mkString(File.pathSeparator), mainClass) ++ arguments LOG.info(s"Starting executor process java $mainClass ${arguments.mkString(" ")} " + s"\n ${options.mkString(" ")}") val logger = new ProcessLogRedirector() http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ffb3d8c9/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/Command.scala ---------------------------------------------------------------------- diff --git a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/Command.scala b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/Command.scala index fb482c4..4ac56e1 100644 --- a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/Command.scala +++ b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/Command.scala @@ -48,7 +48,7 @@ abstract class AbstractCommand extends Command { : String = { val exe = config.getString(java) - s"$exe -noverify -cp ${classPath.mkString(":")}:" + + s"$exe -cp ${classPath.mkString(":")}:" + "$CLASSPATH " + properties.mkString(" ") + s" $mainClazz ${cliOpts.mkString(" ")} 2>&1 | /usr/bin/tee -a ${LOG_DIR_EXPANSION_VAR}/stderr" } @@ -123,4 +123,4 @@ case class AppMasterCommand(config: Config, version: String, args: Array[String] buildCommand(APPMASTER_COMMAND, properties, clazz(YarnAppMaster), arguments) } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ffb3d8c9/experiments/yarn/src/test/scala/org/apache/gearpump/experiments/yarn/client/LaunchClusterSpec.scala ---------------------------------------------------------------------- diff --git a/experiments/yarn/src/test/scala/org/apache/gearpump/experiments/yarn/client/LaunchClusterSpec.scala b/experiments/yarn/src/test/scala/org/apache/gearpump/experiments/yarn/client/LaunchClusterSpec.scala index 3f2f9cb..330ec3b 100644 --- a/experiments/yarn/src/test/scala/org/apache/gearpump/experiments/yarn/client/LaunchClusterSpec.scala +++ b/experiments/yarn/src/test/scala/org/apache/gearpump/experiments/yarn/client/LaunchClusterSpec.scala @@ -186,7 +186,7 @@ class LaunchClusterSpec extends FlatSpec with Matchers with BeforeAndAfterAll { // val workerResources = ArgumentCaptor.forClass(classOf[List[Resource]]) // scalastyle:off line.size.limit - val expectedCommand = "$JAVA_HOME/bin/java -Xmx512m -noverify -cp conf:pack/gearpump-0.2/conf:pack/gearpump-0.2/dashboard:pack/gearpump-0.2/lib/*:pack/gearpump-0.2/lib/daemon/*:pack/gearpump-0.2/lib/services/*:pack/gearpump-0.2/lib/yarn/*:$CLASSPATH -Dgearpump.home={{LOCAL_DIRS}}/{{CONTAINER_ID}}/pack/gearpump-0.2 -Dgearpump.binary-version-with-scala-version=gearpump-0.2 -Dgearpump.log.daemon.dir=<LOG_DIR> -Dgearpump.log.application.dir=<LOG_DIR> -Dgearpump.hostname={{NM_HOST}} org.apache.gearpump.experiments.yarn.appmaster.YarnAppMaster -conf /root/.gearpump_application_0_0000/conf/ -package gearpump.zip 2>&1 | /usr/bin/tee -a <LOG_DIR>/stderr" + val expectedCommand = "$JAVA_HOME/bin/java -Xmx512m -cp conf:pack/gearpump-0.2/conf:pack/gearpump-0.2/dashboard:pack/gearpump-0.2/lib/*:pack/gearpump-0.2/lib/daemon/*:pack/gearpump-0.2/lib/services/*:pack/gearpump-0.2/lib/yarn/*:$CLASSPATH -Dgearpump.home={{LOCAL_DIRS}}/{{CONTAINER_ID}}/pack/gearpump-0.2 -Dgearpump.binary-version-with-scala-version=gearpump-0.2 -Dgearpump.log.daemon.dir=<LOG_DIR> -Dgearpump.log.application.dir=<LOG_DIR> -Dgearpump.hostname={{NM_HOST}} org.apache.gearpump.experiments.yarn.appmaster.YarnAppMaster -conf /root/.gearpump_application_0_0000/conf/ -package gearpump.zip 2>&1 | /usr/bin/tee -a <LOG_DIR>/stderr" // scalastyle:on line.size.limit verify(yarnClient).submit("gearpump", appId, expectedCommand, Resource.newInstance(512, 1), "default", @@ -229,4 +229,4 @@ class LaunchClusterSpec extends FlatSpec with Matchers with BeforeAndAfterAll { zipOut.close() new ByteArrayInputStream(bytes.toByteArray) } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ffb3d8c9/project/Pack.scala ---------------------------------------------------------------------- diff --git a/project/Pack.scala b/project/Pack.scala index 2eb0ca7..e47c53f 100644 --- a/project/Pack.scala +++ b/project/Pack.scala @@ -72,13 +72,11 @@ object Pack extends sbt.Build { ), packJvmOpts := Map( "gear" -> Seq( - "-noverify", "-Djava.net.preferIPv4Stack=true", "-Dgearpump.home=${PROG_HOME}"), "local" -> Seq( "-server", - "-noverify", "-Djava.net.preferIPv4Stack=true", "-DlogFilename=local", "-Dgearpump.home=${PROG_HOME}", @@ -86,7 +84,6 @@ object Pack extends sbt.Build { "master" -> Seq( "-server", - "-noverify", "-Djava.net.preferIPv4Stack=true", "-DlogFilename=master", "-Dgearpump.home=${PROG_HOME}", @@ -94,7 +91,6 @@ object Pack extends sbt.Build { "worker" -> Seq( "-server", - "-noverify", "-Djava.net.preferIPv4Stack=true", "-DlogFilename=worker", "-Dgearpump.home=${PROG_HOME}", @@ -102,21 +98,18 @@ object Pack extends sbt.Build { "services" -> Seq( "-server", - "-noverify", "-Djava.net.preferIPv4Stack=true", "-Dgearpump.home=${PROG_HOME}", "-Djava.rmi.server.hostname=localhost"), "yarnclient" -> Seq( "-server", - "-noverify", "-Djava.net.preferIPv4Stack=true", "-Dgearpump.home=${PROG_HOME}", "-Djava.rmi.server.hostname=localhost"), "storm" -> Seq( "-server", - "-noverify", "-Djava.net.preferIPv4Stack=true", "-Dgearpump.home=${PROG_HOME}") ), http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ffb3d8c9/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index 0a6a562..e622071 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -22,7 +22,7 @@ resolvers += Classpaths.sbtPluginReleases addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4") addSbtPlugin("io.gearpump.sbt" % "sbt-pack" % "0.7.7")
