Author: degenaro
Date: Wed May 15 20:15:40 2019
New Revision: 1859329
URL: http://svn.apache.org/viewvc?rev=1859329&view=rev
Log:
UIMA-6027 org.apache.uima.ducc.database.DbAlive improvement
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_util.py
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1859329&r1=1859328&r2=1859329&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_util.py Wed May 15 20:15:40 2019
@@ -338,7 +338,7 @@ class DuccUtil(DuccBase):
dbnode = self.get_db_host()
- CMD = [self.java(), 'org.apache.uima.ducc.database.DbAlive', dbnode,
'ducc', self.db_password, str(retry)]
+ CMD = [self.java(), 'org.apache.uima.ducc.database.DbAlive',
self.DUCC_HOME, dbnode, str(retry)]
CMD = ' '.join(CMD)
if(not verbose):
Modified:
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java?rev=1859329&r1=1859328&r2=1859329&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbAlive.java
Wed May 15 20:15:40 2019
@@ -33,8 +33,6 @@ import com.datastax.driver.core.exceptio
public class DbAlive
{
String db_host_list;
- String adminid = null;
- String adminpw = null;
enum RC {
OK {
@@ -65,14 +63,12 @@ public class DbAlive
private Cluster cluster;
//private Session session;
- public DbAlive(String db_host_list, String adminid, String adminpw)
+ public DbAlive(String db_host_list)
{
this.db_host_list = db_host_list;
- this.adminid = adminid;
- this.adminpw = adminpw;
}
- public RC connect()
+ private RC connect(String adminid, String adminpw)
throws Exception
{
RC ret = RC.OK;
@@ -124,19 +120,19 @@ public class DbAlive
static void usage()
{
- System.out.println("Usage: DbAlive database_url id pw retry-count");
+ System.out.println("Usage: DbAlive ducc_home database_url
retry_count");
System.exit(1);
}
public static void main(String[] args)
{
- if ( args.length != 4 ) {
+ if ( args.length != 3 ) {
usage();
}
int max = 0;
try {
- max = Integer.parseInt(args[3]); // we'll
wait up to 60 seconds: 20 x 3 seconds
+ max = Integer.parseInt(args[2]); // we'll
wait up to 60 seconds: 20 x 3 seconds
} catch ( NumberFormatException e ) {
System.out.println("Retry count must be numeric.");
System.exit(1);
@@ -145,9 +141,12 @@ public class DbAlive
DbAlive client = null;
RC rc = RC.OK;
try {
- client = new DbAlive(args[0], args[1], args[2]);
+ String ducc_home = args[0];
+ String adminid = DbManager.getDbUser(ducc_home);
+ String adminpw = DbManager.getDbPassword(ducc_home);
+ client = new DbAlive(args[1]);
for ( int i = 0; i < max; i++ ) {
- rc = client.connect();
+ rc = client.connect(adminid, adminpw);
System.out.println(rc.message());
if ( rc == RC.OK) {
break;
Modified:
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java?rev=1859329&r1=1859328&r2=1859329&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java
Wed May 15 20:15:40 2019
@@ -164,25 +164,41 @@ public class DbManager
return session.execute(s);
}
- static void dbPassword()
- throws Exception
+ private static void dbPassword() throws Exception
{
- File f = new File(System.getProperty("DUCC_HOME") +
"/resources.private/" + DbCreate.PASSWORD_FILE);
- // If i can read the file that's supposed to have the super user
password I'll do so. If not, or
- // if there's no password there, tough luck Charlie.
- db_id = "ducc";
- Properties props = new Properties();
- FileInputStream fis = new FileInputStream(f);
- props.load(fis);
- fis.close();
-
- db_pw = props.getProperty(DbCreate.PASSWORD_KEY);
- if ( db_pw == null ) {
- throw new IllegalStateException("Cannot acquire the database
password.");
- }
+ String ducc_home = System.getProperty("DUCC_HOME");
+ db_id = getDbUser(ducc_home);
+ db_pw = getDbPassword(ducc_home);
}
-
+ public static String getDbUser(String ducc_home) {
+ String retVal = null;
+ try {
+ retVal = "ducc";
+ }
+ catch(Exception e) {
+ throw new IllegalStateException(e);
+ }
+ return retVal;
+ }
+
+ public static String getDbPassword(String ducc_home) {
+ String retVal = null;
+ try {
+ String fp =
ducc_home+"/resources.private/"+DbCreate.PASSWORD_FILE;
+ File f = new File(fp);
+ Properties props = new Properties();
+ FileInputStream fis = new FileInputStream(f);
+ props.load(fis);
+ fis.close();
+ retVal = props.getProperty(DbCreate.PASSWORD_KEY);
+ }
+ catch(Exception e) {
+ throw new IllegalStateException(e);
+ }
+ return retVal;
+ }
+
public static void main(String[] args)
{
}
