Skip to content

Commit 54e3d52

Browse files
authored
Increase node acquisition timeout (#131)
1 parent 8418a5e commit 54e3d52

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

sal-service/src/main/java/org/ow2/proactive/sal/service/service/TaskBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ private Map<String, TaskVariable> createVariablesMapForAcquiringIAASNode(Task ta
335335
}
336336
variablesMap.put("nVMs", new TaskVariable("nVMs", "1", "PA:Integer", false));
337337
variablesMap.put("synchronous", new TaskVariable("synchronous", "true", "PA:Boolean", false));
338-
variablesMap.put("timeout", new TaskVariable("timeout", "700", "PA:Long", false));
338+
variablesMap.put("timeout", new TaskVariable("timeout", "300000", "PA:Long", false));
339339
String nodeConfigJson = createIAASNodeConfigJson(task, deployment);
340340
variablesMap.put("nodeConfigJson", new TaskVariable("nodeConfigJson", nodeConfigJson, "PA:JSON", false));
341341
variablesMap.put("token", new TaskVariable("token", nodeToken));

sal-service/src/main/resources/Define_NS_GCE.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def infrastructureParameters = [variables.get("NS_nVMs"),
5959
protocol + "://" + variables.get("rm_host_name") + ":"+ variables.get("pa_port") + "/connector-iaas", // connector-iaas url
6060
protocol + "://" + variables.get("rm_host_name") + ":"+ variables.get("pa_port") + "/rest/node.jar", // nodeJarURL
6161
"-Dproactive.useIPaddress=false", //additionalProperties"
62-
60 * 1000, // nodeTimeout
62+
300 * 1000, // nodeTimeout
6363
"mkdir -p /tmp/node && cd /tmp/node; if ! type -p jre/bin/java; then wget -nv -N https://s3.amazonaws.com/ci-materials/Latest_jre/jre-8u312b07-linux-x64.tar.gz; tar -xf jre-8u312b07-linux-x64.tar.gz; mv jre1.8.0_312b07/ jre; fi; wget -nv --no-check-certificate %nodeJarUrl% ; nohup jre/bin/java -jar node.jar -Dproactive.communication.protocol=%protocol% -Dpython.path=%jythonPath% -Dproactive.pamr.router.address=%rmHostname% -D%instanceIdNodeProperty%=%instanceId% -r %rmUrl% -s %nodeSourceName% %nodeNamingOption% -v %credentials% -w %numberOfNodesPerInstance% %additionalProperties% &"] // linuxStartupScript
6464
6565
def gceCredentialMap = ["client_email": variables.get("user"), "project_id": variables.get("projectId"), "private_key": variables.get("secret")]

0 commit comments

Comments
 (0)