This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 010af8c571 AMBARI-26438: Ambari capacity view add failed (#3983)
010af8c571 is described below
commit 010af8c571e5d22f07df2b82e2aacac9ebe9e985
Author: jialiang <[email protected]>
AuthorDate: Wed Apr 16 14:30:07 2025 +0800
AMBARI-26438: Ambari capacity view add failed (#3983)
---
contrib/views/capacity-scheduler/pom.xml | 30 ++++++--
.../CapacitySchedulerService.java | 2 +-
.../capacityscheduler/ConfigurationService.java | 20 ++---
.../ambari/view/capacityscheduler/HelpService.java | 10 +--
.../utils/MisconfigurationFormattedException.java | 6 +-
.../utils/ServiceFormattedException.java | 6 +-
.../src/main/resources/ui/app/adapters.js | 9 ++-
contrib/views/utils/pom.xml | 87 +++++++++++++++-------
8 files changed, 116 insertions(+), 54 deletions(-)
diff --git a/contrib/views/capacity-scheduler/pom.xml
b/contrib/views/capacity-scheduler/pom.xml
index 913abfe134..3bd47eae90 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -31,17 +31,17 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <version>4.0-beta</version> <!-- version -->
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
+ <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
@@ -50,6 +50,26 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/CapacitySchedulerService.java
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/CapacitySchedulerService.java
index ae73f4a2bc..f4f336d51e 100644
---
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/CapacitySchedulerService.java
+++
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/CapacitySchedulerService.java
@@ -18,7 +18,7 @@
package org.apache.ambari.view.capacityscheduler;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
import org.apache.ambari.view.ViewContext;
import com.google.inject.Inject;
diff --git
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
index 5a95a62e19..9acf04a3f1 100644
---
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
+++
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
@@ -29,16 +29,16 @@ import org.json.simple.JSONValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.io.InputStream;
import java.net.ConnectException;
import java.util.HashMap;
diff --git
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/HelpService.java
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/HelpService.java
index 64ce2e92e5..04e3cce5db 100644
---
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/HelpService.java
+++
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/HelpService.java
@@ -20,11 +20,11 @@ package org.apache.ambari.view.capacityscheduler;
import org.apache.ambari.view.ViewContext;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/MisconfigurationFormattedException.java
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/MisconfigurationFormattedException.java
index 2781be54ce..4772132515 100644
---
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/MisconfigurationFormattedException.java
+++
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/MisconfigurationFormattedException.java
@@ -20,9 +20,9 @@ package org.apache.ambari.view.capacityscheduler.utils;
import org.json.simple.JSONObject;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.HashMap;
/**
diff --git
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/ServiceFormattedException.java
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/ServiceFormattedException.java
index 45af095217..3268ba5b7a 100644
---
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/ServiceFormattedException.java
+++
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/utils/ServiceFormattedException.java
@@ -21,9 +21,9 @@ package org.apache.ambari.view.capacityscheduler.utils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.json.simple.JSONObject;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.HashMap;
/**
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/adapters.js
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/adapters.js
index e4f7df994e..4c7da12937 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/adapters.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/adapters.js
@@ -253,7 +253,14 @@ App.QueueAdapter = DS.Adapter.extend({
return new Ember.RSVP.Promise(function(resolve, reject) {
_ajax(uri,'GET').then(function(data) {
- var parsedData = JSON.parse(data), labels;
+ var parsedData;
+
+ try {
+ parsedData = JSON.parse(data);
+ } catch(e) {
+ console.warn('Failed to parse node labels data:', e);
+ parsedData = null;
+ }
if (parsedData !== null) {
store.set('isNodeLabelsConfiguredByRM', true);
diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml
index 0af426f812..9231b24bb7 100644
--- a/contrib/views/utils/pom.xml
+++ b/contrib/views/utils/pom.xml
@@ -54,44 +54,82 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- <!--removed for security bugs in version : 9.3.19.v20170502-->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <!--removed for security bugs in version : 9.3.19.v20170502-->
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- <!--removed for security bugs in version : 9.3.19.v20170502-->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <!--removed for security bugs in version : 9.3.19.v20170502-->
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
<version>${hadoop.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
<!--removed for security bugs in version : 9.3.19.v20170502-->
<exclusion>
<groupId>org.eclipse.jetty</groupId>
@@ -118,10 +156,7 @@
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- </dependency>
+
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
