You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/10/31 23:45:29 UTC
[1/3] git commit: ACCUMULO-3286 Get some more output on conditional
writer. Don't have enough info as to why it failed.
Repository: accumulo
Updated Branches:
refs/heads/1.6 d3900b21c -> 09a4f0aa6
refs/heads/master 0c51290bc -> eca6022f8
ACCUMULO-3286 Get some more output on conditional writer. Don't have enough info as to why it failed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/09a4f0aa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/09a4f0aa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/09a4f0aa
Branch: refs/heads/1.6
Commit: 09a4f0aa6b47a99a27f6a0be76771e38e571f742
Parents: d3900b2
Author: Josh Elser <el...@apache.org>
Authored: Fri Oct 31 17:41:30 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Oct 31 18:44:43 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/ConditionalWriterIT.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a4f0aa/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 26c53bb..44765f1 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1246,16 +1246,22 @@ public class ConditionalWriterIT extends SimpleMacIT {
}
}
});
+ String traceOutput = finalBuffer.toString();
+ log.info("Trace output:" + traceOutput);
if (traceCount > 0) {
int lastPos = 0;
for (String part : "traceTest, startScan,startConditionalUpdate,conditionalUpdate,Check conditions,apply conditional mutations".split(","))
{
- int pos = finalBuffer.toString().indexOf(part);
- assertTrue(pos > 0);
- assertTrue(pos > lastPos);
+ log.info("Looking in trace output for '" + part + "'");
+ int pos = traceOutput.indexOf(part);
+ assertTrue("Did not find '" + part + "' in output", pos > 0);
+ assertTrue("'" + part + "' occurred earlier than the previous element unexpectedly", pos > lastPos);
lastPos = pos;
}
break;
+ } else {
+ log.info("Ignoring trace output as traceCount not greater than zero: " + traceCount);
+ Thread.sleep(1000);
}
}
if (tracer != null) {
[2/3] git commit: ACCUMULO-3286 Get some more output on conditional
writer. Don't have enough info as to why it failed.
Posted by el...@apache.org.
ACCUMULO-3286 Get some more output on conditional writer. Don't have enough info as to why it failed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/09a4f0aa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/09a4f0aa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/09a4f0aa
Branch: refs/heads/master
Commit: 09a4f0aa6b47a99a27f6a0be76771e38e571f742
Parents: d3900b2
Author: Josh Elser <el...@apache.org>
Authored: Fri Oct 31 17:41:30 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Oct 31 18:44:43 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/ConditionalWriterIT.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a4f0aa/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 26c53bb..44765f1 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1246,16 +1246,22 @@ public class ConditionalWriterIT extends SimpleMacIT {
}
}
});
+ String traceOutput = finalBuffer.toString();
+ log.info("Trace output:" + traceOutput);
if (traceCount > 0) {
int lastPos = 0;
for (String part : "traceTest, startScan,startConditionalUpdate,conditionalUpdate,Check conditions,apply conditional mutations".split(","))
{
- int pos = finalBuffer.toString().indexOf(part);
- assertTrue(pos > 0);
- assertTrue(pos > lastPos);
+ log.info("Looking in trace output for '" + part + "'");
+ int pos = traceOutput.indexOf(part);
+ assertTrue("Did not find '" + part + "' in output", pos > 0);
+ assertTrue("'" + part + "' occurred earlier than the previous element unexpectedly", pos > lastPos);
lastPos = pos;
}
break;
+ } else {
+ log.info("Ignoring trace output as traceCount not greater than zero: " + traceCount);
+ Thread.sleep(1000);
}
}
if (tracer != null) {
[3/3] git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eca6022f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eca6022f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eca6022f
Branch: refs/heads/master
Commit: eca6022f823d264bd4cf60f3f6ef8ae86cb98ae7
Parents: 0c51290 09a4f0a
Author: Josh Elser <el...@apache.org>
Authored: Fri Oct 31 18:45:19 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Oct 31 18:45:19 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/ConditionalWriterIT.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eca6022f/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------