You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/18 03:39:37 UTC
[1/2] git commit: SLIDER-537. Cleanup the top level pom file (Ashish
Singh via smohanty)
Repository: incubator-slider
Updated Branches:
refs/heads/develop 6da903d81 -> c9b47f11c
SLIDER-537. Cleanup the top level pom file (Ashish Singh via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/41541865
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/41541865
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/41541865
Branch: refs/heads/develop
Commit: 4154186544f4f06d470042cdc523f812888d4365
Parents: 6da903d
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Oct 17 17:28:51 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Oct 17 17:28:51 2014 -0700
----------------------------------------------------------------------
app-packages/hbase-win/appConfig-default.json | 2 +-
app-packages/hbase-win/pom.xml | 5 +---
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/hbase/pom.xml | 6 +----
app-packages/storm/pom.xml | 1 +
pom.xml | 30 +++++++++++++++++++---
6 files changed, 32 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase-win/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json
index e82a65f..a802fed 100644
--- a/app-packages/hbase-win/appConfig-default.json
+++ b/app-packages/hbase-win/appConfig-default.json
@@ -3,7 +3,7 @@
"metadata": {
},
"global": {
- "application.def": ".slider/package/HBASE/slider-hbase-app-win-package-${bld.version}.zip",
+ "application.def": ".slider/package/HBASE/slider-hbase-app-win-package-${pkg.version}.zip",
"create.default.zookeeper.node": "true",
"java_home": "C:\\java",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index ad5855e..2df22ee 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -28,7 +28,7 @@
<packaging>pom</packaging>
<name>Slider HBase App Package for Windows</name>
<description>Slider HBase App Package for Windows</description>
- <version>${bld.version}</version>
+ <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
<app.package.name>${project.artifactId}-${project.version}</app.package.name>
@@ -37,9 +37,6 @@
<profiles>
<profile>
<id>hbase-app-package-win</id>
- <properties>
- <bld.version>${pkg.version}</bld.version>
- </properties>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json
index ffd964d..7746fc0 100644
--- a/app-packages/hbase/appConfig-default.json
+++ b/app-packages/hbase/appConfig-default.json
@@ -3,7 +3,7 @@
"metadata": {
},
"global": {
- "application.def": ".slider/package/HBASE/slider-hbase-app-package-${bld.version}.zip",
+ "application.def": ".slider/package/HBASE/slider-hbase-app-package-${pkg.version}.zip",
"create.default.zookeeper.node": "true",
"java_home": "/usr/jdk64/jdk1.7.0_67",
"system_configs": "core-site",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index be1b858..f80346a 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -28,7 +28,7 @@
<packaging>pom</packaging>
<name>Slider HBase App Package</name>
<description>Slider HBase App Package</description>
- <version>${bld.version}</version>
+ <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
<app.package.name>${project.artifactId}-${project.version}</app.package.name>
@@ -37,9 +37,6 @@
<profiles>
<profile>
<id>hbase-app-package</id>
- <properties>
- <bld.version>${pkg.version}</bld.version>
- </properties>
<build>
<plugins>
<plugin>
@@ -87,7 +84,6 @@
<id>hbase-app-package-it</id>
<properties>
<pkg.version>${hbase.version}</pkg.version>
- <bld.version>0.51.0-incubating-SNAPSHOT</bld.version>
<pkg.src>${project.build.directory}/${work.dir}</pkg.src>
<pkg.name>hbase-${hbase.version}-bin.tar.gz</pkg.name>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index c08ed3d..b8e558f 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -21,6 +21,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<version>0.51.0-incubating-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-storm-app-package</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/41541865/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e15632e..77faa64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<!--
+ <!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -38,8 +38,6 @@
<module>app-packages/command-logger/slider-pkg</module>
<module>slider-core</module>
<module>slider-agent</module>
- <module>app-packages/accumulo</module>
- <module>app-packages/hbase</module>
<module>slider-assembly</module>
<module>slider-funtest</module>
<module>slider-providers/hbase/slider-hbase-provider</module>
@@ -1248,6 +1246,32 @@
<profiles>
<profile>
+ <id>linux</id>
+ <activation>
+ <os>
+ <family>linux</family>
+ </os>
+ </activation>
+ <modules>
+ <module>app-packages/accumulo</module>
+ <module>app-packages/hbase</module>
+ <module>app-packages/storm</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>Windows</id>
+ <activation>
+ <os>
+ <name>Windows XP</name>
+ <family>Windows</family>
+ </os>
+ </activation>
+ <modules>
+ <module>app-packages/hbase-win</module>
+ <module>app-packages/storm-win</module>
+ </modules>
+ </profile>
+ <profile>
<id>rat</id>
<build>
<plugins>
[2/2] git commit: SLIDER-533. AgentCmd test app package should
publish config and verify it + some other fixes
Posted by sm...@apache.org.
SLIDER-533. AgentCmd test app package should publish config and verify it + some other fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c9b47f11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c9b47f11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c9b47f11
Branch: refs/heads/develop
Commit: c9b47f11c6407da9936f3fa73fac29e8223388e5
Parents: 4154186
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Oct 17 18:38:33 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Oct 17 18:38:33 2014 -0700
----------------------------------------------------------------------
.../command-logger/slider-pkg/appConfig.json | 3 +-
.../command-logger/slider-pkg/metainfo.xml | 2 ++
.../test_command_log/appConfig.json | 3 +-
.../funtest/framework/CommandTestBase.groovy | 2 +-
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 38 ++++++++++++++++++--
5 files changed, 43 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b47f11/app-packages/command-logger/slider-pkg/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json
index c8bb237..9c19670 100644
--- a/app-packages/command-logger/slider-pkg/appConfig.json
+++ b/app-packages/command-logger/slider-pkg/appConfig.json
@@ -12,7 +12,8 @@
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger",
"site.global.app_install_dir": "${AGENT_WORK_ROOT}/app/install",
"site.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log",
- "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p"
+ "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p",
+ "site.cl-site.pattern.for.test.to.verify": "verify this pattern"
},
"components": {
"COMMAND_LOGGER": {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b47f11/app-packages/command-logger/slider-pkg/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/metainfo.xml b/app-packages/command-logger/slider-pkg/metainfo.xml
index b8de9a3..5de2c37 100644
--- a/app-packages/command-logger/slider-pkg/metainfo.xml
+++ b/app-packages/command-logger/slider-pkg/metainfo.xml
@@ -24,10 +24,12 @@
log file. When stopped it renames the file.
</comment>
<version>0.1.0</version>
+ <exportedConfigs>cl-site</exportedConfigs>
<components>
<component>
<name>COMMAND_LOGGER</name>
<category>MASTER</category>
+ <publishConfig>true</publishConfig>
<commandScript>
<script>scripts/cl.py</script>
<scriptType>PYTHON</scriptType>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b47f11/slider-core/src/test/app_packages/test_command_log/appConfig.json
----------------------------------------------------------------------
diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig.json b/slider-core/src/test/app_packages/test_command_log/appConfig.json
index 8e81421..a3a9ccf 100644
--- a/slider-core/src/test/app_packages/test_command_log/appConfig.json
+++ b/slider-core/src/test/app_packages/test_command_log/appConfig.json
@@ -11,7 +11,8 @@
"site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger",
"site.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log",
- "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p"
+ "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p",
+ "site.cl-site.pattern.for.test.to.verify": "verify this pattern"
},
"components": {
"COMMAND_LOGGER": {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b47f11/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index dc74d16..744ec66 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -598,9 +598,9 @@ abstract class CommandTestBase extends SliderTestUtils {
protected void ensureApplicationIsUp(String clusterName) {
repeatUntilTrue(this.&isApplicationUp,
+ 20,
SLIDER_CONFIG.getInt(KEY_TEST_INSTANCE_LAUNCH_TIME,
DEFAULT_INSTANCE_LAUNCH_TIME_SECONDS),
- 1000,
['arg1': clusterName],
true,
'Application did not start, aborting test.')
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b47f11/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
index 0796355..ff55b05 100644
--- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
+++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy
@@ -97,7 +97,8 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
APPLICATION_NAME,
ARG_GETEXP,
"container_log_dirs"])
- if(!containsString(shell, "\"tag\":\"COMMAND_LOGGER\",\"level\":\"component\"", 2)) {
+ if(!containsString(shell, "\"tag\" : \"COMMAND_LOGGER\"", 2)
+ || !containsString(shell, "\"level\" : \"component\"", 2)) {
logShell(shell)
assert fail("Should list 2 entries for log folders")
}
@@ -110,11 +111,44 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
APPLICATION_NAME,
ARG_GETEXP,
"container_work_dirs"])
- if(!containsString(shell, "\"tag\":\"COMMAND_LOGGER\",\"level\":\"component\"", 2)) {
+ if(!containsString(shell, "\"tag\" : \"COMMAND_LOGGER\"", 2)
+ || !containsString(shell, "\"level\" : \"component\"", 2)) {
logShell(shell)
assert fail("Should list 2 entries for work folder")
}
+ // get cl-site config
+ shell = slider(
+ [
+ ACTION_REGISTRY,
+ ARG_NAME,
+ APPLICATION_NAME,
+ ARG_GETCONF,
+ "cl-site",
+ ARG_FORMAT,
+ "json"])
+
+ for (int i = 0; i < 10; i++) {
+ if (shell.getRet() != EXIT_SUCCESS) {
+ println "Waiting for the cl-site to show up"
+ sleep(1000 * 10)
+ shell = slider(
+ [
+ ACTION_REGISTRY,
+ ARG_NAME,
+ APPLICATION_NAME,
+ ARG_GETCONF,
+ "cl-site",
+ ARG_FORMAT,
+ "json"])
+ }
+ }
+ assert shell.getRet() == EXIT_SUCCESS, "cl-site should be retrieved"
+ if (!containsString(shell, "\"pattern.for.test.to.verify\" : \"verify this pattern\"", 1)) {
+ logShell(shell)
+ assert fail("Should have exported cl-site")
+ }
+
assert isApplicationInState("RUNNING", APPLICATION_NAME), 'App is not running.'
}
}