You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/10/12 17:58:09 UTC
[45/50] [abbrv] oodt git commit: [OODT-963] Fixed surefire test
failures in workflow manager due to forkMode
[OODT-963] Fixed surefire test failures in workflow manager due to forkMode
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c7d0842d
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c7d0842d
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c7d0842d
Branch: refs/heads/master
Commit: c7d0842d9490fcf95f3ba0e07c1dc3cd8b16b76a
Parents: 54089ca
Author: Imesha Sudasingha <im...@apache.org>
Authored: Wed Oct 11 18:19:28 2017 +0530
Committer: Imesha Sudasingha <im...@gmail.com>
Committed: Thu Oct 12 08:07:14 2017 +0530
----------------------------------------------------------------------
.../config/distributed/DistributedConfigurationManager.java | 6 ++++--
.../org/apache/oodt/config/distributed/utils/ConfigUtils.java | 1 +
.../src/test/resources/distributed/config/config-publisher.xml | 1 -
workflow/pom.xml | 3 +--
.../oodt/cas/workflow/system/AvroRpcWorkflowManager.java | 3 +--
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/c7d0842d/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java b/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
index fe36a02..d93c421 100644
--- a/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
+++ b/config/src/main/java/org/apache/oodt/config/distributed/DistributedConfigurationManager.java
@@ -42,7 +42,6 @@ import java.util.concurrent.TimeUnit;
import static org.apache.oodt.config.Constants.Properties.ZK_CONNECT_STRING;
import static org.apache.oodt.config.Constants.Properties.ZK_PROPERTIES_FILE;
import static org.apache.oodt.config.Constants.Properties.ZK_STARTUP_TIMEOUT;
-import static org.apache.oodt.config.distributed.utils.ConfigUtils.getOODTProjectName;
/**
* Distributed configuration manager implementation. This class make use of a {@link CuratorFramework} instance to
@@ -93,7 +92,10 @@ public class DistributedConfigurationManager extends ConfigurationManager {
};
public DistributedConfigurationManager(Component component) {
- super(component, getOODTProjectName());
+ super(component, ConfigUtils.getOODTProjectName());
+
+ logger.info("Found project name {} for component {}", this.project, this.component);
+
this.zNodePaths = new ZNodePaths(this.project, this.component.getName());
if (System.getProperty(ZK_PROPERTIES_FILE) == null && System.getProperty(ZK_CONNECT_STRING) == null) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/c7d0842d/config/src/main/java/org/apache/oodt/config/distributed/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/oodt/config/distributed/utils/ConfigUtils.java b/config/src/main/java/org/apache/oodt/config/distributed/utils/ConfigUtils.java
index bbb24b0..2672ceb 100644
--- a/config/src/main/java/org/apache/oodt/config/distributed/utils/ConfigUtils.java
+++ b/config/src/main/java/org/apache/oodt/config/distributed/utils/ConfigUtils.java
@@ -75,6 +75,7 @@ public class ConfigUtils {
project = System.getenv(Env.OODT_PROJECT);
}
+ logger.debug("Project name {}", project);
return project == null ? Constants.DEFAULT_PROJECT : project;
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/c7d0842d/filemgr/src/test/resources/distributed/config/config-publisher.xml
----------------------------------------------------------------------
diff --git a/filemgr/src/test/resources/distributed/config/config-publisher.xml b/filemgr/src/test/resources/distributed/config/config-publisher.xml
index f6a97c1..dba3c27 100644
--- a/filemgr/src/test/resources/distributed/config/config-publisher.xml
+++ b/filemgr/src/test/resources/distributed/config/config-publisher.xml
@@ -21,7 +21,6 @@
<bean id="filemgr-config-publisher" class="org.apache.oodt.config.distributed.DistributedConfigurationPublisher">
<constructor-arg value="FILE_MANAGER"/>
-
<constructor-arg value="primary"/>
<property name="propertiesFiles">
http://git-wip-us.apache.org/repos/asf/oodt/blob/c7d0842d/workflow/pom.xml
----------------------------------------------------------------------
diff --git a/workflow/pom.xml b/workflow/pom.xml
index cad9c30..03062aa 100644
--- a/workflow/pom.xml
+++ b/workflow/pom.xml
@@ -203,9 +203,8 @@ the License.
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
<configuration>
- <forkMode>never</forkMode>
+ <forkMode>pertest</forkMode>
<useSystemClassLoader>false</useSystemClassLoader>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/oodt/blob/c7d0842d/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java
index ebc2e30..efe5d62 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/AvroRpcWorkflowManager.java
@@ -97,8 +97,7 @@ public class AvroRpcWorkflowManager implements WorkflowManager,org.apache.oodt.c
if(engine == null){
throw new NullPointerException("null engine");
}
- engine.setWorkflowManagerUrl(safeGetUrlFromString("http://"
- + getHostname() + ":" + this.webServerPort));
+ engine.setWorkflowManagerUrl(safeGetUrlFromString("http://" + getHostname() + ":" + this.webServerPort));
repo = getWorkflowRepositoryFromProperty();
LOG.log(Level.INFO, "Starting Netty Server");