[Bigdata-commit] SF.net SVN: bigdata:[3874] branches/QUADS_QUERY_BRANCH/bigdata/src

[<tho...@us...>]

Revision: 3874
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3874&view=rev
Author:   thompsonbry
Date:     2010-11-03 11:52:07 +0000 (Wed, 03 Nov 2010)

Log Message:
-----------
Backing out the introduction of a weak reference into the WriteExecutorService in order to track down some odd errors which this appears to have introduced.  This is per [1].

[1] https://sourceforge.net/apps/trac/bigdata/ticket/196

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/WriteExecutorService.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestJournalShutdown.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/WriteExecutorService.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/WriteExecutorService.java	2010-11-02 19:00:31 UTC (rev 3873)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/WriteExecutorService.java	2010-11-03 11:52:07 UTC (rev 3874)
@@ -221,7 +221,12 @@
     private static class MyLockManager<R extends Comparable<R>> extends
             NonBlockingLockManagerWithNewDesign<R> {
 
-//        private final WriteExecutorService service;
+        /*
+         * FIXME restored hard reference since introducing just a weak reference
+         * here appears to be causing some odd behaviors.  Track these behaviors
+         * down and sort this all out.
+         */
+        private final WriteExecutorService service;
         private final WeakReference<WriteExecutorService> serviceRef;
 
         public MyLockManager(final int capacity, final int maxLockTries,
@@ -230,7 +235,7 @@
 
             super(capacity, maxLockTries, predeclareLocks);
 
-//            this.service = service;
+            this.service = service;
             this.serviceRef = new WeakReference<WriteExecutorService>(service);
 
         }

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestJournalShutdown.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestJournalShutdown.java	2010-11-02 19:00:31 UTC (rev 3873)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/journal/TestJournalShutdown.java	2010-11-03 11:52:07 UTC (rev 3874)
@@ -116,7 +116,8 @@
 
         if (nalive.get() == ncreated.get()) {
 
-            fail("No journals were finalized.");
+            fail("Created " + ncreated
+                    + " journals.  No journals were finalized.");
 
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.