You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2012/10/10 09:56:23 UTC
svn commit: r1396501 - in /incubator/ambari/branches/AMBARI-666: ./
ambari-server/src/main/java/org/apache/ambari/server/controller/
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/
Author: mahadev
Date: Wed Oct 10 07:56:23 2012
New Revision: 1396501
URL: http://svn.apache.org/viewvc?rev=1396501&view=rev
Log:
AMBARI-845. Fix NPE in the server to be able to run the server api's. (mahadev)
Modified:
incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java
Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1396501&r1=1396500&r2=1396501&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Wed Oct 10 07:56:23 2012
@@ -12,6 +12,9 @@ AMBARI-666 branch (unreleased changes)
NEW FEATURES
+ AMBARI-845. Fix NPE in the server to be able to run the server api's.
+ (mahadev)
+
AMBARI-844. Mock JMX provider for manual tests. (Tom Beerbower via mahadev)
AMBARI-841. Fix comparison predicates in case where resource does not have
Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java?rev=1396501&r1=1396500&r2=1396501&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java Wed Oct 10 07:56:23 2012
@@ -251,7 +251,7 @@ public class AmbariManagementControllerI
if (LOG.isDebugEnabled()) {
LOG.debug("Received a createHost request"
+ ", hostname=" + request.getHostname()
- + ", request=" + request);
+ );
}
Host h = clusters.getHost(request.getHostname());
@@ -283,8 +283,6 @@ public class AmbariManagementControllerI
request) throws AmbariException {
if (request.getClusterName() == null
|| request.getClusterName().isEmpty()
- || request.getServiceName() == null
- || request.getServiceName().isEmpty()
|| request.getComponentName() == null
|| request.getComponentName().isEmpty()
|| request.getHostname() == null
@@ -292,14 +290,20 @@ public class AmbariManagementControllerI
// FIXME throw correct error
throw new AmbariException("Invalid arguments");
}
-
+
+ // FIXME Hard coded stuff --- needs to be fixed.
+ if (request.getServiceName() == null
+ || request.getServiceName().isEmpty()
+ ) {
+ request.setServiceName("HDFS");
+ }
if (LOG.isDebugEnabled()) {
LOG.debug("Received a createHostComponent request"
+ ", clusterName=" + request.getClusterName()
+ ", serviceName=" + request.getServiceName()
+ ", componentName=" + request.getComponentName()
+ ", hostname=" + request.getHostname()
- + ", request=" + request);
+ );
}
final Cluster cluster = clusters.getCluster(request.getClusterName());
Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java?rev=1396501&r1=1396500&r2=1396501&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java Wed Oct 10 07:56:23 2012
@@ -32,7 +32,6 @@ import org.mortbay.jetty.Server;
import org.mortbay.jetty.security.SslSocketConnector;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.jetty.servlet.FilterHolder;
import org.mortbay.jetty.servlet.ServletHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +70,12 @@ public class AmbariServer {
CertificateManager certMan;
@Inject
Injector injector;
-
+ private static AmbariManagementController clusterController = null;
+
+ public static AmbariManagementController getController() {
+ return clusterController;
+ }
+
public void run() {
server = new Server(CLIENT_API_PORT);
serverForAgent = new Server();
@@ -113,7 +117,7 @@ public class AmbariServer {
//Spring Security Filter initialization
DelegatingFilterProxy springSecurityFilter = new DelegatingFilterProxy();
springSecurityFilter.setTargetBeanName("springSecurityFilterChain");
- root.addFilter(new FilterHolder(springSecurityFilter), "/*", 1);
+ //root.addFilter(new FilterHolder(springSecurityFilter), "/*", 1);
//Secured connector for 2-way auth
SslSocketConnector sslConnectorTwoWay = new SslSocketConnector();
@@ -155,7 +159,8 @@ public class AmbariServer {
sh.setInitParameter("com.sun.jersey.config.property.resourceConfigClass",
"com.sun.jersey.api.core.PackagesResourceConfig");
sh.setInitParameter("com.sun.jersey.config.property.packages",
- "org.apache.ambari.server.api.rest");
+ "org.apache.ambari.server.api.rest;" +
+ "org.apache.ambari.server.api.services");
root.addServlet(sh, "/api/*");
sh.setInitOrder(2);
@@ -197,7 +202,8 @@ public class AmbariServer {
AmbariManagementController controller = injector.getInstance(
AmbariManagementController.class);
-
+ clusterController = controller;
+
// FIXME need to figure out correct order of starting things to
// handle restart-recovery correctly
@@ -211,9 +217,9 @@ public class AmbariServer {
manager.start();
LOG.info("********* Started ActionManager **********");
- RequestInjectorForTest testInjector = new RequestInjectorForTest(controller, clusters);
- Thread testInjectorThread = new Thread(testInjector);
- testInjectorThread.start();
+ //RequestInjectorForTest testInjector = new RequestInjectorForTest(controller, clusters);
+ //Thread testInjectorThread = new Thread(testInjector);
+ //testInjectorThread.start();
server.join();
LOG.info("Joined the Server");
Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java?rev=1396501&r1=1396500&r2=1396501&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java Wed Oct 10 07:56:23 2012
@@ -28,6 +28,7 @@ import org.apache.ambari.server.state.Cl
import org.apache.ambari.server.state.cluster.ClustersImpl;
import com.google.inject.AbstractModule;
+import com.google.inject.Injector;
import com.google.inject.name.Names;
/**
Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java?rev=1396501&r1=1396500&r2=1396501&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java Wed Oct 10 07:56:23 2012
@@ -18,17 +18,16 @@
package org.apache.ambari.server.controller.internal;
-import org.apache.ambari.server.controller.spi.ProviderModule;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import java.util.LinkedList;
+import java.util.List;
+
import org.apache.ambari.server.controller.AmbariManagementController;
-import org.apache.ambari.server.controller.AmbariManagementControllerImpl;
+import org.apache.ambari.server.controller.AmbariServer;
import org.apache.ambari.server.controller.spi.PropertyProvider;
+import org.apache.ambari.server.controller.spi.ProviderModule;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.ResourceProvider;
-
-import java.util.LinkedList;
-import java.util.List;
-
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
/**
*
*/
@@ -36,13 +35,11 @@ public class DefaultProviderModule imple
private static final List<PropertyProvider> PROPERTY_PROVIDERS =
new LinkedList<PropertyProvider>();
-
+
@Override
public ResourceProvider getResourceProvider(Resource.Type type) {
- AmbariManagementController managementController =
- new AmbariManagementControllerImpl(null, null);
return ResourceProviderImpl.getResourceProvider(type,
PROPERTY_PROVIDERS, PropertyHelper.getPropertyIds(type, "DB"),
- PropertyHelper.getKeyPropertyIds(type), managementController);
+ PropertyHelper.getKeyPropertyIds(type), AmbariServer.getController());
}
}