Pass brick directory instead of mount point to clear_volume_directory.py

Perform commit and close connection after resetting password.

2 files changed, 12 insertions, 7 deletions

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index 45df1ae7..c021aeb2 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -500,18 +500,17 @@ public class VolumesResource extends AbstractResource {
 			String serverName = brickInfo[0];
 			String brickDirectory = brickInfo[1];
 
-			String mountPoint = brickDirectory.substring(0, brickDirectory.lastIndexOf("/"));
 			Object response = serverUtil.executeScriptOnServer(true, serverName, VOLUME_DIRECTORY_CLEANUP_SCRIPT + " "
-					+ mountPoint + " " + volumeName + " " + (deleteFlag ? "-d" : ""), GenericResponse.class);
+					+ brickDirectory + " " + volumeName + " " + (deleteFlag ? "-d" : ""), GenericResponse.class);
 			if (response instanceof GenericResponse) {
 				result = ((GenericResponse) response).getStatus();
 				if (!result.isSuccess()) {
-					errors += "[" + mountPoint + "][" + volumeName + "] => " + result
+					errors += "[" + brickDirectory + "][" + volumeName + "] => " + result
 							+ CoreConstants.NEWLINE;
 				}
 			} else {
 				Status errStatus = (Status) response;
-				errors += "[" + mountPoint + "][" + volumeName + "] => " + errStatus + CoreConstants.NEWLINE;
+				errors += "[" + brickDirectory + "][" + volumeName + "] => " + errStatus + CoreConstants.NEWLINE;
 			}
 		}
 		if(!errors.trim().isEmpty()) {
@@ -523,10 +522,10 @@ public class VolumesResource extends AbstractResource {
 		Status result;
 		for (Brick brick : bricks) {
 			String brickDirectory = brick.getBrickDirectory();
-			String mountPoint = brickDirectory.substring(0, brickDirectory.lastIndexOf("/"));
 
-			result = (Status) serverUtil.executeScriptOnServer(true, brick.getServerName(), VOLUME_DIRECTORY_CLEANUP_SCRIPT
-					+ " " + mountPoint + " " + volumeName + (deleteFlag ? " -d" : ""), Status.class);
+			result = (Status) serverUtil.executeScriptOnServer(true, brick.getServerName(),
+					VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " + brickDirectory + " " + volumeName
+							+ (deleteFlag ? " -d" : ""), Status.class);
 			if (!result.isSuccess()) {
 				throw new GlusterRuntimeException("Error in post-delete operation of volume [" + volumeName + "]: "
 						+ result);
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
index aa2e2d8f..7d2e17ad 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package com.gluster.storage.management.gateway.utils;
 
+import java.sql.Connection;
+
 import org.apache.derby.jdbc.EmbeddedDriver;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.security.authentication.dao.ReflectionSaltSource;
@@ -44,6 +46,10 @@ public class PasswordManager {
 			userAuthDao.changePassword(username, encodedPassword);
 			System.out.println("Password for user [" + username + "] reset successsfully to default value of ["
 					+ CoreConstants.DEFAULT_PASSWORD + "].\n");
+			
+			Connection connection = userAuthDao.getDataSource().getConnection(); 
+			connection.commit();
+			connection.close();
 		} catch (Exception e) {
 			System.err
 					.println("\n\nPassword reset for user ["