You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2018/07/18 18:36:24 UTC
svn commit: r1836217 - in /uima/uima-ducc/trunk:
src/main/admin/ducc_post_install src/main/resources/default.ducc.properties
uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex
Author: degenaro
Date: Wed Jul 18 18:36:24 2018
New Revision: 1836217
URL: http://svn.apache.org/viewvc?rev=1836217&view=rev
Log:
UIMA-5742 Reliable DUCC - allow specification of --db-home on ducc_post_install and in default.ducc.properties
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc_post_install
uima/uima-ducc/trunk/src/main/resources/default.ducc.properties
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_post_install
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_post_install?rev=1836217&r1=1836216&r2=1836217&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_post_install (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_post_install Wed Jul 18 18:36:24 2018
@@ -66,6 +66,9 @@ class PostInstall():
print " [-a, --db-automanage] <True|False>"
print " Specify False if DUCC should not start/stop database."
print ""
+ print " [-m, --db-home] <path>"
+ print " The location of the database home directory, only specify when db-automanage is False and the default database directory should not be used."
+ print ""
print " [-o, --db-host-list] host1 <host2 host3...>"
print " The database host(s)."
print ""
@@ -359,7 +362,13 @@ class PostInstall():
if ( self.database_user == None ):
self.database_user = 'ducc'
self.update_property('ducc.database.user', self.database_user, '# Database user')
-
+ # ducc.database.home
+ if ( self.database_home != None ):
+ if(self.database_automanage == False):
+ self.update_property('ducc.database.home', self.database_home, '# Database home')
+ else:
+ print "db-home ignored", self.database_home, '\n'
+
def mkbackup(self, fn):
if ( os.path.exists(fn) ):
bak = fn + '.bak'
@@ -441,13 +450,14 @@ class PostInstall():
self.ducc_head = None
self.keystore_pw = None
self.database_automanage = None
+ self.database_home = None
self.database_host_list = None
self.database_user = None
self.database_pw = None
self.path_to_java = None
try:
- opts, args = getopt.getopt(argv, 'a:o:u:d:j:k:n:h?', ['db-automanage=', 'db-host-list=', 'db-user=', 'db-password=', 'jvm=', 'keystore=', 'head-node=', 'help'])
+ opts, args = getopt.getopt(argv, 'a:m:o:u:d:j:k:n:h?', ['db-automanage=', 'db-home=', 'db-host-list=', 'db-user=', 'db-password=', 'jvm=', 'keystore=', 'head-node=', 'help'])
except:
self.usage("Invalid arguments " + ' '.join(argv))
@@ -459,6 +469,8 @@ class PostInstall():
self.database_automanage = True
else:
self.database_automanage = False
+ if o in ('-m', '--db-home'):
+ self.database_home = a
if o in ('-o', '--db-host-list'):
self.database_host_list = a
if o in ('-u', '--db-user'):
Modified: uima/uima-ducc/trunk/src/main/resources/default.ducc.properties
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/resources/default.ducc.properties?rev=1836217&r1=1836216&r2=1836217&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/resources/default.ducc.properties (original)
+++ uima/uima-ducc/trunk/src/main/resources/default.ducc.properties Wed Jul 18 18:36:24 2018
@@ -1037,6 +1037,9 @@ ducc.database.jmx.port = 7199
# start/stop scripting.
ducc.database.automanage = true
+# Path to Cassandra database home
+ducc.database.home = ${DUCC_HOME}/cassandra-server
+
#-----------------------------------
# DATABASE MEMORY TUNING
# WARNING: if you're not sure what these do you should probably not change them as incorrect
Modified: uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex?rev=1836217&r1=1836216&r2=1836217&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex (original)
+++ uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex Wed Jul 18 18:36:24 2018
@@ -437,7 +437,7 @@ check_ducc -n nlist1 -n nlist2
\paragraph{Usage:}
This command takes two parameters, a pointer to the DUCC\_HOME to be updated or created,
- and the name of the tar file containg the new build.
+ and the name of the tar file containing the new build.
\begin{description}
\item[ducc\_update {\em some-ducc-home} {\em binary-tar-file}]
Update an existing DUCC installation or install a new one.