You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/09/20 05:48:35 UTC
incubator-griffin git commit: Support for HDP
Repository: incubator-griffin
Updated Branches:
refs/heads/master dcddf9689 -> 33fe4c139
Support for HDP
Added parameter for CISF protection in Ambari. Can be provided in a separate branch.
Author: Sparsh Singhal <sp...@hashmapinc.com>
Closes #409 from SparshSinghalHM/patch-4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/33fe4c13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/33fe4c13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/33fe4c13
Branch: refs/heads/master
Commit: 33fe4c139f9a48b8391b75212f710a157857e181
Parents: dcddf96
Author: Sparsh Singhal <sp...@hashmapinc.com>
Authored: Thu Sep 20 13:48:30 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Thu Sep 20 13:48:30 2018 +0800
----------------------------------------------------------------------
.../org/apache/griffin/core/job/SparkSubmitJob.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/33fe4c13/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
index 64478b8..cd0e7e8 100644
--- a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
@@ -63,6 +63,10 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import static org.apache.griffin.core.util.JsonUtil.toJsonWithFormat;
@PersistJobDataAfterExecution
@DisallowConcurrentExecution
@@ -70,7 +74,7 @@ import org.springframework.web.client.RestTemplate;
public class SparkSubmitJob implements Job {
private static final Logger LOGGER =
LoggerFactory.getLogger(SparkSubmitJob.class);
-
+ private static final String REQUEST_BY_HEADER = "X-Requested-By";
@Autowired
private JobInstanceRepo jobInstanceRepo;
@Autowired
@@ -113,8 +117,13 @@ public class SparkSubmitJob implements Job {
private String post2Livy() {
String result = null;
try {
- result = restTemplate.postForObject(livyUri, livyConfMap,
- String.class);
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.set(REQUEST_BY_HEADER,"admin");
+
+ HttpEntity<String> springEntity = new HttpEntity<String>(toJsonWithFormat(livyConfMap), headers );
+ result = restTemplate.postForObject(livyUri,springEntity,String.class);
+
LOGGER.info(result);
} catch (HttpClientErrorException e) {
LOGGER.error("Post to livy ERROR. \n {} {}",