azkaban-uncached

bug fixes

3/6/2013 7:37:43 PM

cjyu

Commit: a65dc2a

Tree: 5dfe844

Parents: ea1a3f8

Changes

src/java/azkaban/user/UserManager.java 2(+1 -1)

src/java/azkaban/user/XmlUserManager.java 4(+2 -2)

src/java/azkaban/webapp/AzkabanWebServer.java 1(+0 -1)

src/java/azkaban/webapp/servlet/ProjectManagerServlet.java 4(+2 -2)

src/sql/create_execution_logs.sql 2(+1 -1)

Details

src/java/azkaban/user/UserManager.java 2(+1 -1)

diff --git a/src/java/azkaban/user/UserManager.java b/src/java/azkaban/user/UserManager.java
index e027c25..a5329c4 100644
--- a/src/java/azkaban/user/UserManager.java
+++ b/src/java/azkaban/user/UserManager.java
@@ -59,5 +59,5 @@ public interface UserManager {
 	 */
 	public Role getRole(String roleName);
 
-	public boolean validateProxyUser(String proxyUser, String realUser);
+	public boolean validateProxyUser(String proxyUser, User realUser);
 }

src/java/azkaban/user/XmlUserManager.java 4(+2 -2)

diff --git a/src/java/azkaban/user/XmlUserManager.java b/src/java/azkaban/user/XmlUserManager.java
index ab1fbe8..7c26daf 100644
--- a/src/java/azkaban/user/XmlUserManager.java
+++ b/src/java/azkaban/user/XmlUserManager.java
@@ -271,8 +271,8 @@ public class XmlUserManager implements UserManager {
 	}
 
 	@Override
-	public boolean validateProxyUser(String proxyUser, String realUser) {
-		if(proxyUserMap.containsKey(realUser) && proxyUserMap.get(realUser).contains(proxyUser)) {
+	public boolean validateProxyUser(String proxyUser, User realUser) {
+		if(proxyUserMap.containsKey(realUser.getUserId()) && proxyUserMap.get(realUser.getUserId()).contains(proxyUser)) {
 			return true;
 		}
 		else {

src/java/azkaban/webapp/AzkabanWebServer.java 1(+0 -1)

diff --git a/src/java/azkaban/webapp/AzkabanWebServer.java b/src/java/azkaban/webapp/AzkabanWebServer.java
index 71eb652..bbdfbf2 100644
--- a/src/java/azkaban/webapp/AzkabanWebServer.java
+++ b/src/java/azkaban/webapp/AzkabanWebServer.java
@@ -471,7 +471,6 @@ public class AzkabanWebServer implements AzkabanServer {
 					logger.error("Error while shutting down http server.", e);
 				}
 				logger.info("kk thx bye.");
-				System.exit(0);
 			}
 		});
 		logger.info("Server running on port " + sslPortNumber + ".");

src/java/azkaban/webapp/servlet/ProjectManagerServlet.java 4(+2 -2)

diff --git a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
index 328b6d6..2a2fda2 100644
--- a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
+++ b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -570,7 +570,7 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
 				return;
 			}
 			else {
-				if(userManager.validateProxyUser(name, user.getUserId())) {
+				if(userManager.validateProxyUser(name, user)) {
 					proxyUsers.add(name);
 				}
 				else {
@@ -584,7 +584,7 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
 				return;
 			}
 			else {
-				if(userManager.validateProxyUser(name, user.getUserId())) {
+				if(userManager.validateProxyUser(name, user)) {
 					proxyUsers.remove(name);
 				}
 				else {

src/sql/create_execution_logs.sql 2(+1 -1)

diff --git a/src/sql/create_execution_logs.sql b/src/sql/create_execution_logs.sql
index 07e0b7b..69e0cad 100644
--- a/src/sql/create_execution_logs.sql
+++ b/src/sql/create_execution_logs.sql
@@ -6,7 +6,7 @@ CREATE TABLE execution_logs (
 	start_byte INT,
 	end_byte INT,
 	log LONGBLOB,
-	PRIMARY KEY (exec_id, name, attempt),
+	PRIMARY KEY (exec_id, name, attempt, start_byte),
 	INDEX log_index (exec_id, name),
 	INDEX byte_log_index(exec_id, name, start_byte, end_byte)
 ) ENGINE=InnoDB;