tier/libgfdb: Extending log level flexibity in libgfdb

Extending log level flexibity to relevant fops and operations This is an extension to http://review.gluster.org/#/c/12491/ Change-Id: I33b2f7732f89f52569fb99baa692c7e3bb4c7ab1 BUG: 1277352 Signed-off-by: Joseph Fernandes <josferna@redhat.com> Reviewed-on: http://review.gluster.org/12567 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Tested-by: Dan Lambright <dlambrig@redhat.com>
author: Joseph Fernandes <josferna@redhat.com> 2015-11-10 22:50:55 +0530
committer: Dan Lambright <dlambrig@redhat.com> 2015-11-11 06:21:02 -0800
commit: 3dadb0f4eff1cad703be92b17f7c230955e12d67 (patch)
tree: 73776ee0669c4e4a3c049160dc40e82cd05ba39a /tests/basic/gfapi/anonymous_fd_read_write.c
parent: 9a69ad2c8438b9fbdcb133404a5d205f809bbb5a (diff)
0 files changed, 0 insertions, 0 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
index f38c1a5f..9eaaca93 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
@@ -25,6 +25,7 @@ import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.client.urlconnection.HTTPSProperties;
@@ -121,8 +122,12 @@ public abstract class AbstractClient {
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private Object fetchResource(WebResource res, MultivaluedMap<String, String> queryParams, Class responseClass) {
-		return res.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML)
-				.get(responseClass);
+		try {
+			return res.queryParams(queryParams)
+					.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML).get(responseClass);
+		} catch(UniformInterfaceException e) {
+			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
+		}
 	}
 
 	protected void downloadResource(WebResource res, String filePath) {
@@ -212,6 +217,29 @@ public abstract class AbstractClient {
 		return fetchResource(resource.path(subResourceName), queryParams, responseClass);
 	}
 
+	private void postRequest(WebResource resource, Form form) {
+		try {
+			prepareFormRequestBuilder(resource).post(form);
+		} catch (UniformInterfaceException e) {
+			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
+		}
+	}
+
+	/**
+	 * Submits given object to the resource and returns the object received as response
+	 * 
+	 * @param responseClass
+	 *            Class of the object expected as response
+	 * @param requestObject
+	 *            the Object to be submitted
+	 * @return Object of given class received as response
+	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	protected Object postObject(Class responseClass, Object requestObject) {
+		return resource.type(MediaType.APPLICATION_XML).header(HTTP_HEADER_AUTH, authHeader)
+				.accept(MediaType.APPLICATION_XML).post(responseClass, requestObject);
+	}
+
 	/**
 	 * Submits given Form using POST method to the resource and returns the object received as response
 	 * 
@@ -219,12 +247,7 @@ public abstract class AbstractClient {
 	 *            Form to be submitted
 	 */
 	protected void postRequest(Form form) {
-		try {
-			resource.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE).header(HTTP_HEADER_AUTH, authHeader)
-					.accept(MediaType.APPLICATION_XML).post(form);
-		} catch (UniformInterfaceException e) {
-			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
-		}
+		postRequest(resource, form);
 	}
 
 	/**
@@ -236,14 +259,22 @@ public abstract class AbstractClient {
 	 *            Form to be submitted
 	 */
 	protected void postRequest(String subResourceName, Form form) {
+		postRequest(resource.path(subResourceName), form);
+	}
+	
+	private void putRequest(WebResource resource, Form form) {
 		try {
-			resource.path(subResourceName).type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
-					.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML).post(form);
+			prepareFormRequestBuilder(resource).put(form);
 		} catch (UniformInterfaceException e) {
 			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
 		}
 	}
 
+	public Builder prepareFormRequestBuilder(WebResource resource) {
+		return resource.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
+				.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML);
+	}
+	
 	/**
 	 * Submits given Form using PUT method to the given sub-resource and returns the object received as response
 	 * 
@@ -253,12 +284,7 @@ public abstract class AbstractClient {
 	 *            Form to be submitted
 	 */
 	protected void putRequest(String subResourceName, Form form) {
-		try {
-			resource.path(subResourceName).type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
-					.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML).put(form);
-		} catch (UniformInterfaceException e) {
-			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
-		}
+		putRequest(resource.path(subResourceName), form);
 	}
 
 	/**
@@ -268,12 +294,7 @@ public abstract class AbstractClient {
 	 *            Form to be submitted
 	 */
 	protected void putRequest(Form form) {
-		try {
-		resource.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE).header(HTTP_HEADER_AUTH, authHeader)
-				.accept(MediaType.APPLICATION_XML).put(form);
-		} catch(UniformInterfaceException e) {
-			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
-		}
+		putRequest(resource, form);
 	}
 
 	/**
@@ -284,38 +305,27 @@ public abstract class AbstractClient {
 	 */
 	protected void putRequest(String subResourceName) {
 		try {
-			resource.path(subResourceName).type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
-					.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML).put();
+			prepareFormRequestBuilder(resource.path(subResourceName)).put();
 		} catch (UniformInterfaceException e) {
 			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
 		}
 	}
 
-	/**
-	 * Submits given object to the resource and returns the object received as response
-	 * 
-	 * @param responseClass
-	 *            Class of the object expected as response
-	 * @param requestObject
-	 *            the Object to be submitted
-	 * @return Object of given class received as response
-	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	protected Object postObject(Class responseClass, Object requestObject) {
-		return resource.type(MediaType.APPLICATION_XML).header(HTTP_HEADER_AUTH, authHeader)
-				.accept(MediaType.APPLICATION_XML).post(responseClass, requestObject);
+	private void deleteResource(WebResource resource, MultivaluedMap<String, String> queryParams) {
+		try {
+			resource.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader)
+					.delete();
+		} catch (UniformInterfaceException e) {
+			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
+		}
 	}
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	protected Object deleteResource(Class responseClass, MultivaluedMap<String, String> queryParams) {
-		return resource.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).delete(responseClass);
+	
+	protected void deleteResource(MultivaluedMap<String, String> queryParams) {
+		deleteResource(resource, queryParams);
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	protected Object deleteSubResource(String subResourceName, Class responseClass,
-			MultivaluedMap<String, String> queryParams) {
-		return resource.path(subResourceName).queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader)
-				.delete(responseClass);
+	protected void deleteSubResource(String subResourceName, MultivaluedMap<String, String> queryParams) {
+		deleteResource(resource.path(subResourceName), queryParams);
 	}
 
 	protected void deleteSubResource(String subResourceName) {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index fe8b3048..3a33e4e4 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -33,6 +33,7 @@ import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
 import com.gluster.storage.management.core.model.GlusterDataModel;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.Server;
+import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
@@ -110,7 +111,9 @@ public class GlusterDataModelManager {
 	private void initializeAutoDiscoveredServers(Cluster cluster) {
 		ServerListResponse discoveredServerListResponse = new DiscoveredServersClient(securityToken)
 				.getDiscoveredServerDetails();
-		if (!discoveredServerListResponse.getStatus().isSuccess()) {
+		Status status = discoveredServerListResponse.getStatus();
+		if (!status.isSuccess() && !status.isPartSuccess()) {
+			// TODO: Find a way to show warning in case of part success
 			throw new GlusterRuntimeException(discoveredServerListResponse.getStatus().getMessage());
 		}
 		cluster.setAutoDiscoveredServers(discoveredServerListResponse.getData());
@@ -118,20 +121,11 @@ public class GlusterDataModelManager {
 
 	private void initializeVolumes(Cluster cluster) {
 		VolumesClient volumeClient = new VolumesClient();
-		VolumeListResponse response = volumeClient.getAllVolumes();
-		if (!response.getStatus().isSuccess()) {
-			throw new GlusterRuntimeException("Error fetching volume list: [" + response.getStatus() + "]");
-		}
-		cluster.setVolumes(response.getVolumes());
+		cluster.setVolumes(volumeClient.getAllVolumes());
 	}
 
 	private void initializeVolumeOptionsDefaults() {
-		VolumeOptionInfoListResponse response = new VolumesClient().getVolumeOptionsDefaults();
-		if (!response.getStatus().isSuccess()) {
-			throw new GlusterRuntimeException("Error fetching volume option defaults: ["
-					+ response.getStatus().getMessage() + "]");
-		}
-		this.volumeOptionsDefaults = response.getOptions();
+		this.volumeOptionsDefaults = new VolumesClient().getVolumeOptionsDefaults();</
author	Joseph Fernandes <josferna@redhat.com>	2015-11-10 22:50:55 +0530
committer	Dan Lambright <dlambrig@redhat.com>	2015-11-11 06:21:02 -0800
commit	3dadb0f4eff1cad703be92b17f7c230955e12d67 (patch)
tree	73776ee0669c4e4a3c049160dc40e82cd05ba39a /tests/basic/gfapi/anonymous_fd_read_write.c
parent	9a69ad2c8438b9fbdcb133404a5d205f809bbb5a (diff)