You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2018/09/24 13:26:04 UTC
[1/3] ranger git commit: RANGER-2212: Add multiple urls tips for the ‘Kylin URL’ configuration item when creating the kylin-plugin service
Repository: ranger
Updated Branches:
refs/heads/ranger-1 7e19c5355 -> d731a0461
RANGER-2212: Add multiple urls tips for the ‘Kylin URL’ configuration item when creating the kylin-plugin service
Signed-off-by: peng.jianhua <pe...@zte.com.cn>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/aab95d37
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/aab95d37
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/aab95d37
Branch: refs/heads/ranger-1
Commit: aab95d37046ec031bb7c16976f491d16b3326261
Parents: f3d8bbe
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Mon Sep 10 15:41:29 2018 +0800
Committer: Mehul Parikh <me...@apache.org>
Committed: Mon Sep 24 18:55:27 2018 +0530
----------------------------------------------------------------------
.../src/main/resources/service-defs/ranger-servicedef-kylin.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/aab95d37/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json
----------------------------------------------------------------------
diff --git a/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json b/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json
index cda3526..3e0f0a3 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json
@@ -86,7 +86,7 @@
"defaultValue": "",
"validationRegEx":"",
"validationMessage": "",
- "uiHint":"{\"TextFieldWithIcon\":true, \"info\": \"eg. 'http://<ipaddr>:7070'\"}",
+ "uiHint":"{\"TextFieldWithIcon\":true, \"info\": \"1.For one url, eg.<br>'http://<ipaddr>:7070'<br>2.For multiple urls (use , or ; delimiter), eg.<br>'http://<ipaddr1>:7070,http://<ipaddr2>:7070'\"}",
"label": "Kylin URL"
}
[3/3] ranger git commit: RANGER-2213: Tomcat Security Vulnerability
Alert. The version of the tomcat for ranger should upgrade to 7.0.90.
Posted by me...@apache.org.
RANGER-2213: Tomcat Security Vulnerability Alert. The version of the tomcat for ranger should upgrade to 7.0.90.
Signed-off-by: Mehul Parikh <me...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/d731a046
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/d731a046
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/d731a046
Branch: refs/heads/ranger-1
Commit: d731a0461b95262ecc024bb66a8eea3ab72e924e
Parents: aab95d3
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Tue Sep 11 11:05:31 2018 +0800
Committer: Mehul Parikh <me...@apache.org>
Committed: Mon Sep 24 18:55:28 2018 +0530
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/d731a046/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 18be2e5..13fd080 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
<sqoop.version>1.99.7</sqoop.version>
<storm.version>1.2.0</storm.version>
<sun-jersey-bundle.version>1.19</sun-jersey-bundle.version>
- <tomcat.embed.version>7.0.85</tomcat.embed.version>
+ <tomcat.embed.version>7.0.90</tomcat.embed.version>
<velocity.version>1.7</velocity.version>
<zookeeper.version>3.4.6</zookeeper.version>
</properties>
[2/3] ranger git commit: RANGER-2214: Do some code improvement for
the error message for KylinClient.java
Posted by me...@apache.org.
RANGER-2214: Do some code improvement for the error message for KylinClient.java
Signed-off-by: 邢鹏 10209390 <xi...@zte.com.cn>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f3d8bbe4
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f3d8bbe4
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f3d8bbe4
Branch: refs/heads/ranger-1
Commit: f3d8bbe4c131b3053fa7009704b9bf8c4d146be6
Parents: 7e19c53
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Tue Sep 11 11:28:16 2018 +0800
Committer: Mehul Parikh <me...@apache.org>
Committed: Mon Sep 24 18:55:27 2018 +0530
----------------------------------------------------------------------
.../services/kylin/client/KylinClient.java | 21 ++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/f3d8bbe4/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java
----------------------------------------------------------------------
diff --git a/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java b/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java
index 9cf21aa..17e0ecb 100644
--- a/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java
+++ b/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java
@@ -163,12 +163,21 @@ public class KylinClient extends BaseClient {
private List<KylinProjectResponse> getKylinProjectResponse(ClientResponse response) {
List<KylinProjectResponse> projectResponses = null;
try {
- if (response != null && response.getStatus() == HttpStatus.SC_OK) {
- String jsonString = response.getEntity(String.class);
- Gson gson = new GsonBuilder().setPrettyPrinting().create();
-
- projectResponses = gson.fromJson(jsonString, new TypeToken<List<KylinProjectResponse>>() {
- }.getType());
+ if (response != null) {
+ if (response.getStatus() == HttpStatus.SC_OK) {
+ String jsonString = response.getEntity(String.class);
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
+ projectResponses = gson.fromJson(jsonString, new TypeToken<List<KylinProjectResponse>>() {
+ }.getType());
+ } else {
+ String msgDesc = "Unable to get a valid response for " + "expected mime type : [" + EXPECTED_MIME_TYPE
+ + "], kylinUrl: " + kylinUrl + " - got http response code " + response.getStatus();
+ LOG.error(msgDesc);
+ HadoopException hdpException = new HadoopException(msgDesc);
+ hdpException.generateResponseDataMap(false, msgDesc, msgDesc + ERROR_MESSAGE, null, null);
+ throw hdpException;
+ }
} else {
String msgDesc = "Unable to get a valid response for " + "expected mime type : [" + EXPECTED_MIME_TYPE
+ "], kylinUrl: " + kylinUrl + " - got null response.";