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/02/07 14:20:32 UTC
svn commit: r1823468 - in /uima/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbDuccWorks.java
Author: degenaro
Date: Wed Feb 7 14:20:32 2018
New Revision: 1823468
URL: http://svn.apache.org/viewvc?rev=1823468&view=rev
Log:
UIMA-5634 DUCC Orchestrator (OR) populate DB with Job and Managed Reservation specifications
If ducc.database.host == "--disabled--" then use filesystem, not DB.
Modified:
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbDuccWorks.java
Modified: uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java?rev=1823468&r1=1823467&r2=1823468&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java Wed Feb 7 14:20:32 2018
@@ -486,13 +486,41 @@ public abstract class CliBase
* will result in specification written to filesystem,
* otherwise not. Orchestrator writes specifications to DB.
*/
- private boolean isSavable() {
+ private boolean isSaveSpecification() {
boolean retVal = false;
String savespec = System.getenv("DUCC_SAVE_SPECIFICATION");
if ( savespec != null ) {
retVal = true;
}
return retVal;
+ }
+
+ /*
+ * If DB is disabled, then save specification to filesystem
+ */
+ private boolean isDbDisabled() {
+ boolean retVal = false;
+ String dbHost = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_database_host, "?");
+ if(dbHost.equals(DuccPropertiesResolver.ducc_database_disabled)) {
+ retVal = true;
+ }
+ return retVal;
+ }
+
+ /*
+ * Save specification to filesystem if:
+ * 1. User requested or
+ * 2. DB is disabled
+ */
+ private boolean isSavable() {
+ boolean retVal = false;
+ if(isSaveSpecification()) {
+ retVal = true;
+ }
+ else if(isDbDisabled()) {
+ retVal = true;
+ }
+ return retVal;
}
void saveSpec(String name, DuccProperties props)
Modified: uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbDuccWorks.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbDuccWorks.java?rev=1823468&r1=1823467&r2=1823468&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbDuccWorks.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbDuccWorks.java Wed Feb 7 14:20:32 2018
@@ -25,6 +25,7 @@ import org.apache.uima.ducc.common.persi
import org.apache.uima.ducc.common.persistence.or.ITypedProperties;
import org.apache.uima.ducc.common.persistence.or.TypedProperties;
import org.apache.uima.ducc.common.utils.DuccLogger;
+import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import com.datastax.driver.core.ResultSet;
@@ -55,6 +56,17 @@ public class DbDuccWorks implements IDbD
init(duccLogger);
}
+ private String messageDbDisabled = "db disabled";
+ private String dbHost = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_database_host, "?");
+
+ private boolean isDbDisabled() {
+ boolean retVal = false;
+ if(dbHost.equals(DuccPropertiesResolver.ducc_database_disabled)) {
+ retVal = true;
+ }
+ return retVal;
+ }
+
/*
* connect to DB
*/
@@ -108,6 +120,10 @@ public class DbDuccWorks implements IDbD
*/
public void dbInit() throws Exception {
String location = "dbInit";
+ if(isDbDisabled()) {
+ logger.debug(location, jobid, messageDbDisabled);
+ return;
+ }
try {
List<SimpleStatement>specificationsSchema = mkSchema();
DbHandle h = dbManager.open();
@@ -127,7 +143,12 @@ public class DbDuccWorks implements IDbD
*/
@Override
public void init(DuccLogger duccLogger) throws Exception {
+ String location = "init";
this.logger = duccLogger;
+ if(isDbDisabled()) {
+ logger.debug(location, jobid, messageDbDisabled);
+ return;
+ }
String dbUrl = System.getProperty(DbManager.URL_PROPERTY);
init(dbUrl);
}
@@ -142,6 +163,10 @@ public class DbDuccWorks implements IDbD
public void upsertSpecification(String type, long id, ITypedProperties properties) throws Exception {
String location = "upsertSpecification";
String gsonString = null;
+ if(isDbDisabled()) {
+ logger.debug(location, jobid, messageDbDisabled);
+ return;
+ }
try {
gsonString = gson.toJson(properties);
String table = DUCC_WORKS_TABLE;
@@ -168,6 +193,10 @@ public class DbDuccWorks implements IDbD
public ITypedProperties fetchSpecification(String type, long id) throws Exception {
String location = "fetchSpecification";
ITypedProperties properties = null;
+ if(isDbDisabled()) {
+ logger.debug(location, jobid, messageDbDisabled);
+ return properties;
+ }
try {
String table = DUCC_WORKS_TABLE;
String c1 = COL_TYPE+"="+"'"+type+"'";