Merge pull request #1356 from marklogic/bugfix/DHFPROD-653

Charles Greer · web-flow · commit 5c4fdc057ea6 · 2018-09-20T19:52:14.000-07:00
Bugfix/dhfprod 653
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/debug-lib.xqy b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/debug-lib.xqy
@@ -48,7 +48,7 @@ declare function debug:enable($enabled as xs:boolean)
 declare function debug:on() as xs:boolean
 {
   let $key := "debugging-enabled"
-  let $flag :=  hul:from-field-cache-or-empty($key, ())
+  let $flag :=  hul:from-field-cache-or-empty($key, $hul:EXPIRATION)
   return
     if (exists($flag)) then
       $flag
@@ -65,7 +65,7 @@ declare function debug:on() as xs:boolean
             )
           )
         ',(), map:new(map:entry("database", xdmp:modules-database()))),
-        ()
+        $hul:EXPIRATION
       )
 };
 
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/hub-utils-lib.xqy b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/hub-utils-lib.xqy
@@ -29,6 +29,8 @@ declare namespace hub = "http://marklogic.com/data-hub";
 
 declare option xdmp:mapping "false";
 
+declare variable $hul:EXPIRATION as xs:dayTimeDuration := xs:dayTimeDuration("PT0.3S");
+
 declare variable $_cache := map:map();
 (:~
  : determine if a module exists or not
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/trace-lib.xqy b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/trace-lib.xqy
@@ -71,7 +71,7 @@ declare function trace:enable-tracing($enabled as xs:boolean)
 declare function trace:enabled() as xs:boolean
 {
   let $key := "tracing-enabled"
-  let $flag :=  hul:from-field-cache-or-empty($key, ())
+  let $flag :=  hul:from-field-cache-or-empty($key, $hul:EXPIRATION)
   return
     if (exists($flag)) then
       $flag
@@ -88,7 +88,7 @@ declare function trace:enabled() as xs:boolean
             )
           )
         ',(), map:new(map:entry("database", xdmp:modules-database()))),
-        xs:dayTimeDuration("PT1M")
+        $hul:EXPIRATION
       )
 };
 
diff --git a/marklogic-data-hub/src/test/java/com/marklogic/hub/HubTestBase.java b/marklogic-data-hub/src/test/java/com/marklogic/hub/HubTestBase.java
@@ -337,39 +337,11 @@ protected void disableDebugging() {
     }
 
     protected void enableTracing() {
-        ManageClient manageClient = ((HubConfigImpl)getHubFlowRunnerConfig()).getManageClient();
-        String resp = manageClient.getJson("/manage/v2/hosts?format=json");
-        JsonNode actualObj = null;
-		try {
-			actualObj = new ObjectMapper().readTree(resp);
-		} catch (IOException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		JsonNode nameNode = actualObj.path("host-default-list").path("list-items");
-		List<String> hosts = nameNode.findValuesAsText("nameref");
-        hosts.forEach(serverHost ->
-		{
-			try {
-				DatabaseClient client = getClient(serverHost, stagingPort, HubConfig.DEFAULT_STAGING_NAME, flowRunnerUser, flowRunnerPassword, stagingAuthMethod);
-				Tracing.create(client).enable();
-				clients.add(client);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		});
+        Tracing.create(stagingClient).enable();
     }
 
     protected void disableTracing() {
-        clients.forEach(client ->
-		{
-			Tracing.create(client).disable();
-			client.newServerEval().xquery("xquery version \"1.0-ml\";\n" +
-					"import module namespace hul = \"http://marklogic.com/data-hub/hub-utils-lib\" at \"/data-hub/4/impl/hub-utils-lib.xqy\";\n" +
-					"hul:invalidate-field-cache(\"tracing-enabled\")").eval();
-
-		});
+        Tracing.create(stagingClient).disable();
     }
 
     //getHubAdminConfig is used for installation, scaffolding
@@ -1083,7 +1055,7 @@ private void installCARootCertIntoStore(File caRootCert) {
         }
     }
 
-    protected void debugOutput(Document xmldoc) throws TransformerException {
+    protected void debugOutput(Document xmldoc) {
         debugOutput(xmldoc, System.out);
     }
 
diff --git a/marklogic-data-hub/src/test/java/com/marklogic/hub/job/TracingTest.java b/marklogic-data-hub/src/test/java/com/marklogic/hub/job/TracingTest.java
@@ -15,32 +15,33 @@
  */
 package com.marklogic.hub.job;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Paths;
-
-import com.marklogic.hub.FlowManager;
-import com.marklogic.hub.HubConfig;
-import com.marklogic.hub.HubTestBase;
-import com.marklogic.hub.Tracing;
-import org.junit.*;
-import org.w3c.dom.Document;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.marklogic.client.document.DocumentRecord;
 import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.io.JacksonHandle;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.query.RawStructuredQueryDefinition;
 import com.marklogic.client.query.StructuredQueryBuilder;
+import com.marklogic.hub.FlowManager;
+import com.marklogic.hub.HubConfig;
+import com.marklogic.hub.HubTestBase;
+import com.marklogic.hub.Tracing;
 import com.marklogic.hub.flow.Flow;
 import com.marklogic.hub.flow.FlowRunner;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.w3c.dom.Document;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Paths;
+
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.junit.Assert.*;
 
 
 public class TracingTest extends HubTestBase {
@@ -51,6 +52,7 @@ public class TracingTest extends HubTestBase {
 
     @Before
     public void setup() throws IOException, URISyntaxException {
+        XMLUnit.setIgnoreWhitespace(true);
         enableDebugging();
         clearDatabases(HubConfig.DEFAULT_STAGING_NAME,  HubConfig.DEFAULT_JOB_NAME, HubConfig.DEFAULT_FINAL_NAME);
 
@@ -304,6 +306,7 @@ public void runSjsXmlFlowWithBinaryContent() {
 
         DocumentRecord doc = finalDocMgr.read("1").next();
         Document finalDoc = doc.getContent(new DOMHandle()).get();
+        //debugOutput(finalDoc);
         assertXMLEqual(getXmlFromResource("tracing-test/traces/finalSjsXmlDoc.xml"), finalDoc);
 
         Document node = traceDocMgr.search(allButCollectors(), 1).next().getContent(new DOMHandle()).get();
diff --git a/marklogic-data-hub/src/test/java/com/marklogic/hub/util/Installer.java b/marklogic-data-hub/src/test/java/com/marklogic/hub/util/Installer.java
@@ -1,11 +1,20 @@
 package com.marklogic.hub.util;
 
 
+import com.marklogic.appdeployer.AppConfig;
+import com.marklogic.appdeployer.command.Command;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.hub.HubConfig;
 import com.marklogic.hub.HubTestBase;
+import com.marklogic.hub.deploy.commands.LoadHubModulesCommand;
+import com.marklogic.hub.deploy.commands.LoadUserStagingModulesCommand;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class Installer {
 
     HubTestBase htb;
@@ -45,7 +54,7 @@ public void uninstallHub() {
         	htb.deleteProjectDir();
         }
         catch(Exception e) {
-        	logger.warn("Unable to delete the project directory", e);        	
+        	logger.warn("Unable to delete the project directory", e);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ declare function debug:enable($enabled as xs:boolean)`
`48`	`48`	`declare function debug:on() as xs:boolean`
`49`	`49`	`{`
`50`	`50`	`let $key := "debugging-enabled"`
`51`		`- let $flag := hul:from-field-cache-or-empty($key, ())`
	`51`	`+ let $flag := hul:from-field-cache-or-empty($key, $hul:EXPIRATION)`
`52`	`52`	`return`
`53`	`53`	`if (exists($flag)) then`
`54`	`54`	`$flag`
`@@ -65,7 +65,7 @@ declare function debug:on() as xs:boolean`
`65`	`65`	`)`
`66`	`66`	`)`
`67`	`67`	`',(), map:new(map:entry("database", xdmp:modules-database()))),`
`68`		`- ()`
	`68`	`+ $hul:EXPIRATION`
`69`	`69`	`)`
`70`	`70`	`};`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ declare function trace:enable-tracing($enabled as xs:boolean)`
`71`	`71`	`declare function trace:enabled() as xs:boolean`
`72`	`72`	`{`
`73`	`73`	`let $key := "tracing-enabled"`
`74`		`- let $flag := hul:from-field-cache-or-empty($key, ())`
	`74`	`+ let $flag := hul:from-field-cache-or-empty($key, $hul:EXPIRATION)`
`75`	`75`	`return`
`76`	`76`	`if (exists($flag)) then`
`77`	`77`	`$flag`
`@@ -88,7 +88,7 @@ declare function trace:enabled() as xs:boolean`
`88`	`88`	`)`
`89`	`89`	`)`
`90`	`90`	`',(), map:new(map:entry("database", xdmp:modules-database()))),`
`91`		`- xs:dayTimeDuration("PT1M")`
	`91`	`+ $hul:EXPIRATION`
`92`	`92`	`)`
`93`	`93`	`};`
`94`	`94`