Skip to content

Commit 010af8c

Browse files
JiaLiangCJiaLiangC
authored
AMBARI-26438: Ambari capacity view add failed (#3983)
1 parent 5aadc37 commit 010af8c

File tree

8 files changed

+116
-54
lines changed

8 files changed

+116
-54
lines changed

‎contrib/views/capacity-scheduler/pom.xml‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
<dependency>
3232
<groupId>com.google.inject</groupId>
3333
<artifactId>guice</artifactId>
34-
<version>4.0-beta</version> <!-- version -->
35-
</dependency>
36-
<dependency>
37-
<groupId>org.glassfish.jersey.containers</groupId>
38-
<artifactId>jersey-container-servlet</artifactId>
34+
<version>${guice.version}</version>
3935
</dependency>
4036
<dependency>
4137
<groupId>org.apache.hadoop</groupId>
4238
<artifactId>hadoop-common</artifactId>
4339
<version>${hadoop.version}</version>
4440
<exclusions>
41+
<exclusion>
42+
<groupId>org.eclipse.jetty</groupId>
43+
<artifactId>*</artifactId>
44+
</exclusion>
4545
<exclusion>
4646
<groupId>tomcat</groupId>
4747
<artifactId>jasper-runtime</artifactId>
@@ -50,6 +50,26 @@
5050
<groupId>org.eclipse.jetty</groupId>
5151
<artifactId>jetty-util</artifactId>
5252
</exclusion>
53+
<exclusion>
54+
<groupId>javax.servlet</groupId>
55+
<artifactId>servlet-api</artifactId>
56+
</exclusion>
57+
<exclusion>
58+
<groupId>javax.servlet.jsp</groupId>
59+
<artifactId>jsp-api</artifactId>
60+
</exclusion>
61+
<exclusion>
62+
<groupId>org.slf4j</groupId>
63+
<artifactId>slf4j-log4j12</artifactId>
64+
</exclusion>
65+
<exclusion>
66+
<groupId>log4j</groupId>
67+
<artifactId>log4j</artifactId>
68+
</exclusion>
69+
<exclusion>
70+
<artifactId>*</artifactId>
71+
<groupId>com.sun.jersey</groupId>
72+
</exclusion>
5373
</exclusions>
5474
</dependency>
5575
<dependency>

‎contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/CapacitySchedulerService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.ambari.view.capacityscheduler;
2020

21-
import javax.ws.rs.Path;
21+
import jakarta.ws.rs.Path;
2222
import org.apache.ambari.view.ViewContext;
2323
import com.google.inject.Inject;
2424

‎contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

32-
import javax.ws.rs.Consumes;
33-
import javax.ws.rs.GET;
34-
import javax.ws.rs.PUT;
35-
import javax.ws.rs.Path;
36-
import javax.ws.rs.PathParam;
37-
import javax.ws.rs.Produces;
38-
import javax.ws.rs.QueryParam;
39-
import javax.ws.rs.WebApplicationException;
40-
import javax.ws.rs.core.MediaType;
41-
import javax.ws.rs.core.Response;
32+
import jakarta.ws.rs.Consumes;
33+
import jakarta.ws.rs.GET;
34+
import jakarta.ws.rs.PUT;
35+
import jakarta.ws.rs.Path;
36+
import jakarta.ws.rs.PathParam;
37+
import jakarta.ws.rs.Produces;
38+
import jakarta.ws.rs.QueryParam;
39+
import jakarta.ws.rs.WebApplicationException;
40+
import jakarta.ws.rs.core.MediaType;
41+
import jakarta.ws.rs.core.Response;
4242
import java.io.InputStream;
4343
import java.net.ConnectException;
4444
import java.util.HashMap;

‎contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/HelpService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import org.apache.ambari.view.ViewContext;
2222

23-
import javax.ws.rs.GET;
24-
import javax.ws.rs.Path;
25-
import javax.ws.rs.Produces;
26-
import javax.ws.rs.core.MediaType;
27-
import javax.ws.rs.core.Response;
23+
import jakarta.ws.rs.GET;
24+
import jakarta.ws.rs.Path;
25+
import jakarta.ws.rs.Produces;
26+
import jakarta.ws.rs.core.MediaType;
27+
import jakarta.ws.rs.core.Response;
2828

2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;

‎contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/MisconfigurationFormattedException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import org.json.simple.JSONObject;
2222

23-
import javax.ws.rs.WebApplicationException;
24-
import javax.ws.rs.core.MediaType;
25-
import javax.ws.rs.core.Response;
23+
import jakarta.ws.rs.WebApplicationException;
24+
import jakarta.ws.rs.core.MediaType;
25+
import jakarta.ws.rs.core.Response;
2626
import java.util.HashMap;
2727

2828
/**

‎contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/ServiceFormattedException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.apache.commons.lang.exception.ExceptionUtils;
2222
import org.json.simple.JSONObject;
2323

24-
import javax.ws.rs.WebApplicationException;
25-
import javax.ws.rs.core.MediaType;
26-
import javax.ws.rs.core.Response;
24+
import jakarta.ws.rs.WebApplicationException;
25+
import jakarta.ws.rs.core.MediaType;
26+
import jakarta.ws.rs.core.Response;
2727
import java.util.HashMap;
2828

2929
/**

‎contrib/views/capacity-scheduler/src/main/resources/ui/app/adapters.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,14 @@ App.QueueAdapter = DS.Adapter.extend({
253253

254254
return new Ember.RSVP.Promise(function(resolve, reject) {
255255
_ajax(uri,'GET').then(function(data) {
256-
var parsedData = JSON.parse(data), labels;
256+
var parsedData;
257+
258+
try {
259+
parsedData = JSON.parse(data);
260+
} catch(e) {
261+
console.warn('Failed to parse node labels data:', e);
262+
parsedData = null;
263+
}
257264

258265
if (parsedData !== null) {
259266
store.set('isNodeLabelsConfiguredByRM', true);

‎contrib/views/utils/pom.xml‎

Lines changed: 61 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,44 +54,82 @@
5454
<groupId>org.apache.hadoop</groupId>
5555
<artifactId>hadoop-hdfs</artifactId>
5656
<version>${hadoop.version}</version>
57-
<exclusions>
58-
<exclusion>
59-
<groupId>tomcat</groupId>
60-
<artifactId>jasper-runtime</artifactId>
61-
</exclusion>
62-
<!--removed for security bugs in version : 9.3.19.v20170502-->
63-
<exclusion>
64-
<groupId>org.eclipse.jetty</groupId>
65-
<artifactId>jetty-util</artifactId>
66-
</exclusion>
67-
</exclusions>
57+
<exclusions>
58+
<exclusion>
59+
<groupId>org.eclipse.jetty</groupId>
60+
<artifactId>*</artifactId>
61+
</exclusion>
62+
<exclusion>
63+
<artifactId>*</artifactId>
64+
<groupId>com.sun.jersey</groupId>
65+
</exclusion>
66+
<exclusion>
67+
<groupId>tomcat</groupId>
68+
<artifactId>jasper-runtime</artifactId>
69+
</exclusion>
70+
<!--removed for security bugs in version : 9.3.19.v20170502-->
71+
<exclusion>
72+
<groupId>org.eclipse.jetty</groupId>
73+
<artifactId>jetty-util</artifactId>
74+
</exclusion>
75+
</exclusions>
6876
</dependency>
6977
<dependency>
7078
<groupId>org.apache.hadoop</groupId>
7179
<artifactId>hadoop-common</artifactId>
7280
<version>${hadoop.version}</version>
73-
<exclusions>
74-
<exclusion>
75-
<groupId>tomcat</groupId>
76-
<artifactId>jasper-runtime</artifactId>
77-
</exclusion>
78-
<!--removed for security bugs in version : 9.3.19.v20170502-->
79-
<exclusion>
80-
<groupId>org.eclipse.jetty</groupId>
81-
<artifactId>jetty-util</artifactId>
82-
</exclusion>
83-
</exclusions>
81+
<exclusions>
82+
<exclusion>
83+
<groupId>org.eclipse.jetty</groupId>
84+
<artifactId>*</artifactId>
85+
</exclusion>
86+
<exclusion>
87+
<artifactId>*</artifactId>
88+
<groupId>com.sun.jersey</groupId>
89+
</exclusion>
90+
<exclusion>
91+
<groupId>tomcat</groupId>
92+
<artifactId>jasper-runtime</artifactId>
93+
</exclusion>
94+
<!--removed for security bugs in version : 9.3.19.v20170502-->
95+
<exclusion>
96+
<groupId>org.eclipse.jetty</groupId>
97+
<artifactId>jetty-util</artifactId>
98+
</exclusion>
99+
</exclusions>
84100
</dependency>
85101
<dependency>
86102
<groupId>org.apache.hadoop</groupId>
87103
<artifactId>hadoop-hdfs-client</artifactId>
88104
<version>${hadoop.version}</version>
105+
<exclusions>
106+
<exclusion>
107+
<groupId>org.eclipse.jetty</groupId>
108+
<artifactId>*</artifactId>
109+
</exclusion>
110+
<exclusion>
111+
<artifactId>*</artifactId>
112+
<groupId>com.sun.jersey</groupId>
113+
</exclusion>
114+
</exclusions>
89115
</dependency>
90116
<dependency>
91117
<groupId>org.apache.hadoop</groupId>
92118
<artifactId>hadoop-yarn-common</artifactId>
93119
<version>${hadoop.version}</version>
94120
<exclusions>
121+
<exclusion>
122+
<groupId>com.sun.jersey.contribs</groupId>
123+
<artifactId>*</artifactId>
124+
</exclusion>
125+
<exclusion>
126+
<groupId>org.eclipse.jetty</groupId>
127+
<artifactId>*</artifactId>
128+
</exclusion>
129+
<exclusion>
130+
<artifactId>*</artifactId>
131+
<groupId>com.sun.jersey</groupId>
132+
</exclusion>
95133
<!--removed for security bugs in version : 9.3.19.v20170502-->
96134
<exclusion>
97135
<groupId>org.eclipse.jetty</groupId>
@@ -118,10 +156,7 @@
118156
<groupId>com.google.inject</groupId>
119157
<artifactId>guice</artifactId>
120158
</dependency>
121-
<dependency>
122-
<groupId>org.glassfish.jersey.containers</groupId>
123-
<artifactId>jersey-container-servlet</artifactId>
124-
</dependency>
159+
125160
<dependency>
126161
<groupId>org.glassfish.jersey.media</groupId>
127162
<artifactId>jersey-media-multipart</artifactId>

0 commit comments

Comments
 (0)