[14/51] [abbrv] ambari git commit: AMBARI-19843. Publish asset has issues when different users logins (Madhan Mohan Reddy via gauravn7)

2017-02-17 Thread rzang 
AMBARI-19843. Publish asset has issues when different users logins (Madhan 
Mohan Reddy via gauravn7)

(cherry picked from commit 919500f2fe00e4f2ab923d39ef3ab02f19a78b48)

Change-Id: I07e0757f2c68521cf0606a61b6d60e34c4fff034


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ef12149
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ef12149
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ef12149

Branch: refs/heads/branch-feature-BUG-74026
Commit: 0ef121498f2667c4909d055cf41a0b72ee227b10
Parents: ffaa961
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:15:52 2017 +0530
Committer: Zuul 
Committed: Mon Feb 6 23:24:16 2017 -0800

--
 .../java/org/apache/oozie/ambari/view/assets/AssetResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ef12149/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
--
diff --git 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
index af86810..ef3b508 100644
--- 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
+++ 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
@@ -115,7 +115,7 @@ public class AssetResource {
 String workflowXml = oozieUtils.generateWorkflowXml(postBody);
 try {
   Map result = new HashMap<>();
-  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf.xml";
+  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf_" + 
Math.round(Math.random()*10) + ".xml";
   hdfsFileUtils.writeToFile(tempWfPath, workflowXml, true);
   queryParams.put("oozieparam.action", getAsList("dryrun"));
   queryParams.put("oozieconfig.rerunOnFailure", getAsList("false"));
@@ -125,6 +125,7 @@ public class AssetResource {
 tempWfPath, queryParams, JobType.WORKFLOW);
   LOGGER.info(String.format("resp from validating asset=[%s]",
 dryRunResp));
+  hdfsFileUtils.deleteFile(tempWfPath);
   if (dryRunResp != null && dryRunResp.trim().startsWith("{")) {
 JsonElement jsonElement = new JsonParser().parse(dryRunResp);
 JsonElement idElem = jsonElement.getAsJsonObject().get("id");

[32/50] [abbrv] ambari git commit: AMBARI-19843. Publish asset has issues when different users logins (Madhan Mohan Reddy via gauravn7)

2017-02-03 Thread ncole 
AMBARI-19843. Publish asset has issues when different users logins (Madhan 
Mohan Reddy via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b472f2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b472f2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b472f2e

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0b472f2e2efbe1d1b2c2dc78c7442d59237edf2a
Parents: b5ee4c5
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:15:52 2017 +0530
Committer: Gaurav Nagar 
Committed: Thu Feb 2 18:15:52 2017 +0530

--
 .../java/org/apache/oozie/ambari/view/assets/AssetResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b472f2e/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
--
diff --git 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
index af86810..ef3b508 100644
--- 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
+++ 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
@@ -115,7 +115,7 @@ public class AssetResource {
 String workflowXml = oozieUtils.generateWorkflowXml(postBody);
 try {
   Map result = new HashMap<>();
-  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf.xml";
+  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf_" + 
Math.round(Math.random()*10) + ".xml";
   hdfsFileUtils.writeToFile(tempWfPath, workflowXml, true);
   queryParams.put("oozieparam.action", getAsList("dryrun"));
   queryParams.put("oozieconfig.rerunOnFailure", getAsList("false"));
@@ -125,6 +125,7 @@ public class AssetResource {
 tempWfPath, queryParams, JobType.WORKFLOW);
   LOGGER.info(String.format("resp from validating asset=[%s]",
 dryRunResp));
+  hdfsFileUtils.deleteFile(tempWfPath);
   if (dryRunResp != null && dryRunResp.trim().startsWith("{")) {
 JsonElement jsonElement = new JsonParser().parse(dryRunResp);
 JsonElement idElem = jsonElement.getAsJsonObject().get("id");

ambari git commit: AMBARI-19843. Publish asset has issues when different users logins (Madhan Mohan Reddy via gauravn7)

2017-02-02 Thread gnagar 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4418789fc -> 919500f2f


AMBARI-19843. Publish asset has issues when different users logins (Madhan 
Mohan Reddy via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/919500f2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/919500f2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/919500f2

Branch: refs/heads/branch-2.5
Commit: 919500f2fe00e4f2ab923d39ef3ab02f19a78b48
Parents: 4418789
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:15:52 2017 +0530
Committer: Gaurav Nagar 
Committed: Thu Feb 2 18:16:47 2017 +0530

--
 .../java/org/apache/oozie/ambari/view/assets/AssetResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/919500f2/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
--
diff --git 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
index af86810..ef3b508 100644
--- 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
+++ 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
@@ -115,7 +115,7 @@ public class AssetResource {
 String workflowXml = oozieUtils.generateWorkflowXml(postBody);
 try {
   Map result = new HashMap<>();
-  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf.xml";
+  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf_" + 
Math.round(Math.random()*10) + ".xml";
   hdfsFileUtils.writeToFile(tempWfPath, workflowXml, true);
   queryParams.put("oozieparam.action", getAsList("dryrun"));
   queryParams.put("oozieconfig.rerunOnFailure", getAsList("false"));
@@ -125,6 +125,7 @@ public class AssetResource {
 tempWfPath, queryParams, JobType.WORKFLOW);
   LOGGER.info(String.format("resp from validating asset=[%s]",
 dryRunResp));
+  hdfsFileUtils.deleteFile(tempWfPath);
   if (dryRunResp != null && dryRunResp.trim().startsWith("{")) {
 JsonElement jsonElement = new JsonParser().parse(dryRunResp);
 JsonElement idElem = jsonElement.getAsJsonObject().get("id");

ambari git commit: AMBARI-19843. Publish asset has issues when different users logins (Madhan Mohan Reddy via gauravn7)

2017-02-02 Thread gnagar 
Repository: ambari
Updated Branches:
  refs/heads/trunk b5ee4c57a -> 0b472f2e2


AMBARI-19843. Publish asset has issues when different users logins (Madhan 
Mohan Reddy via gauravn7)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b472f2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b472f2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b472f2e

Branch: refs/heads/trunk
Commit: 0b472f2e2efbe1d1b2c2dc78c7442d59237edf2a
Parents: b5ee4c5
Author: Gaurav Nagar 
Authored: Thu Feb 2 18:15:52 2017 +0530
Committer: Gaurav Nagar 
Committed: Thu Feb 2 18:15:52 2017 +0530

--
 .../java/org/apache/oozie/ambari/view/assets/AssetResource.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b472f2e/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
--
diff --git 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
index af86810..ef3b508 100644
--- 
a/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
+++ 
b/contrib/views/wfmanager/src/main/java/org/apache/oozie/ambari/view/assets/AssetResource.java
@@ -115,7 +115,7 @@ public class AssetResource {
 String workflowXml = oozieUtils.generateWorkflowXml(postBody);
 try {
   Map result = new HashMap<>();
-  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf.xml";
+  String tempWfPath = "/tmp" + "/tmpooziewfs/tempwf_" + 
Math.round(Math.random()*10) + ".xml";
   hdfsFileUtils.writeToFile(tempWfPath, workflowXml, true);
   queryParams.put("oozieparam.action", getAsList("dryrun"));
   queryParams.put("oozieconfig.rerunOnFailure", getAsList("false"));
@@ -125,6 +125,7 @@ public class AssetResource {
 tempWfPath, queryParams, JobType.WORKFLOW);
   LOGGER.info(String.format("resp from validating asset=[%s]",
 dryRunResp));
+  hdfsFileUtils.deleteFile(tempWfPath);
   if (dryRunResp != null && dryRunResp.trim().startsWith("{")) {
 JsonElement jsonElement = new JsonParser().parse(dryRunResp);
 JsonElement idElem = jsonElement.getAsJsonObject().get("id");