Repository: incubator-ranger Updated Branches: refs/heads/master b625bb0c7 -> 0614046a4
RANGER-565: Fixed Oracle JDBC driver issue causing dba_script/db_setup failure with java.sql.SQLRecoverableException: IO Error when using Oracle Signed-off-by: sneethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/0614046a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0614046a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0614046a Branch: refs/heads/master Commit: 0614046a4e273a48b3d659e590bdc63e54559aeb Parents: b625bb0 Author: Velmurugan Periasamy <[email protected]> Authored: Tue Jun 23 18:40:53 2015 -0400 Committer: sneethiraj <[email protected]> Committed: Tue Jun 23 17:01:11 2015 -0700 ---------------------------------------------------------------------- kms/scripts/db_setup.py | 1 + kms/scripts/dba_script.py | 1 + security-admin/scripts/db_setup.py | 3 ++- security-admin/scripts/dba_script.py | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0614046a/kms/scripts/db_setup.py ---------------------------------------------------------------------- diff --git a/kms/scripts/db_setup.py b/kms/scripts/db_setup.py index fd10f4e..8116049 100644 --- a/kms/scripts/db_setup.py +++ b/kms/scripts/db_setup.py @@ -190,6 +190,7 @@ class OracleConf(BaseDB): #path = os.getcwd() path = RANGER_KMS_HOME self.JAVA_BIN = self.JAVA_BIN.strip("'") + self.JAVA_BIN = self.JAVA_BIN + " -Djava.security.egd=file:///dev/urandom " if os_name == "LINUX": jisql_cmd = "%s -cp %s:%s/jisql/lib/* org.apache.util.sql.Jisql -driver oraclethin -cstring jdbc:oracle:thin:@%s -u '%s' -p '%s' -noheader -trim" %(self.JAVA_BIN, self.SQL_CONNECTOR_JAR,path, self.host, user, password) elif os_name == "WINDOWS": http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0614046a/kms/scripts/dba_script.py ---------------------------------------------------------------------- diff --git a/kms/scripts/dba_script.py b/kms/scripts/dba_script.py index 2a3d5d7..c549fad 100644 --- a/kms/scripts/dba_script.py +++ b/kms/scripts/dba_script.py @@ -326,6 +326,7 @@ class OracleConf(BaseDB): def get_jisql_cmd(self, user, password): #TODO: User array for forming command path = RANGER_KMS_HOME + self.JAVA_BIN = self.JAVA_BIN + " -Djava.security.egd=file:///dev/urandom " if os_name == "LINUX": jisql_cmd = "%s -cp %s:%s/jisql/lib/* org.apache.util.sql.Jisql -driver oraclethin -cstring jdbc:oracle:thin:@%s -u '%s' -p '%s' -noheader -trim" %(self.JAVA_BIN, self.SQL_CONNECTOR_JAR,path, self.host, user, password) elif os_name == "WINDOWS": http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0614046a/security-admin/scripts/db_setup.py ---------------------------------------------------------------------- diff --git a/security-admin/scripts/db_setup.py b/security-admin/scripts/db_setup.py index 35f4dc9..90d7d4e 100644 --- a/security-admin/scripts/db_setup.py +++ b/security-admin/scripts/db_setup.py @@ -398,6 +398,7 @@ class OracleConf(BaseDB): def get_jisql_cmd(self, user, password): path = RANGER_ADMIN_HOME self.JAVA_BIN = self.JAVA_BIN.strip("'") + self.JAVA_BIN = self.JAVA_BIN + " -Djava.security.egd=file:///dev/urandom " if os_name == "LINUX": jisql_cmd = "%s -cp %s:%s/jisql/lib/* org.apache.util.sql.Jisql -driver oraclethin -cstring jdbc:oracle:thin:@%s -u '%s' -p '%s' -noheader -trim" %(self.JAVA_BIN, self.SQL_CONNECTOR_JAR, path, self.host, user, password) elif os_name == "WINDOWS": @@ -632,7 +633,7 @@ class OracleConf(BaseDB): path = os.path.join("%s","WEB-INF","classes","conf:%s","WEB-INF","classes","lib","*:%s","WEB-INF",":%s","META-INF",":%s","WEB-INF","lib","*:%s","WEB-INF","classes",":%s","WEB-INF","classes","META-INF:%s" )%(app_home ,app_home ,app_home, app_home, app_home, app_home ,app_home ,self.SQL_CONNECTOR_JAR) elif os_name == "WINDOWS": path = os.path.join("%s","WEB-INF","classes","conf;%s","WEB-INF","classes","lib","*;%s","WEB-INF",";%s","META-INF",";%s","WEB-INF","lib","*;%s","WEB-INF","classes",";%s","WEB-INF","classes","META-INF;%s" )%(app_home ,app_home ,app_home, app_home, app_home, app_home ,app_home ,self.SQL_CONNECTOR_JAR) - get_cmd = "%s -Dlogdir=%s -Dlog4j.configuration=db_patch.log4j.xml -cp %s org.apache.ranger.patch.%s"%(self.JAVA_BIN,ranger_log,path,className) + get_cmd = "%s -Djava.security.egd=file:///dev/urandom -Dlogdir=%s -Dlog4j.configuration=db_patch.log4j.xml -cp %s org.apache.ranger.patch.%s"%(self.JAVA_BIN,ranger_log,path,className) if os_name == "LINUX": ret = subprocess.call(shlex.split(get_cmd)) elif os_name == "WINDOWS": http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0614046a/security-admin/scripts/dba_script.py ---------------------------------------------------------------------- diff --git a/security-admin/scripts/dba_script.py b/security-admin/scripts/dba_script.py index a3737ed..133af15 100644 --- a/security-admin/scripts/dba_script.py +++ b/security-admin/scripts/dba_script.py @@ -333,10 +333,13 @@ class OracleConf(BaseDB): def get_jisql_cmd(self, user, password): #TODO: User array for forming command path = RANGER_ADMIN_HOME + #print "self.JAVA_BIN=" + self.JAVA_BIN + self.JAVA_BIN = self.JAVA_BIN + " -Djava.security.egd=file:///dev/urandom " if os_name == "LINUX": jisql_cmd = "%s -cp %s:%s/jisql/lib/* org.apache.util.sql.Jisql -driver oraclethin -cstring jdbc:oracle:thin:@%s -u '%s' -p '%s' -noheader -trim" %(self.JAVA_BIN, self.SQL_CONNECTOR_JAR,path, self.host, user, password) elif os_name == "WINDOWS": jisql_cmd = "%s -cp %s;%s\jisql\\lib\\* org.apache.util.sql.Jisql -driver oraclethin -cstring jdbc:oracle:thin:@%s -u %s -p %s -noheader -trim" %(self.JAVA_BIN, self.SQL_CONNECTOR_JAR, path, self.host, user, password) + #print jisql_cmd return jisql_cmd def check_connection(self, db_name, db_user, db_password):
