Merge lp:~pbeaman/akiban-persistit/java7-issues into lp:akiban-persistit

[Peter Beaman]

Fixes a couple of issues that emerged while running unit tests under Java7 on Max OSX.

1. Due to a bug in the OSX version of the JDK, getLocalHost() is either broken or very slow. Since the RMI and JMX services are not used by unit tests, this branch simply removes them from the UnitTestProperties configurations.

2. FileChannel appears to have slightly different behavior when a write is interrupted, possibly leaving the write completed and the ByteBuffer empty. To compensate, MediatedFileChannelTest resets the position of the ByteBuffer.

[Nathan Williams (nwilliams)]

Simple and point 2 sounds important.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

* job server-build failed at build number 3678: http://172.16.20.104:8080/job/server-build/3678/

* view must-pass failed: server-build is yellow

review: Needs Fixing

[Peter Beaman (pbeaman)]

Seemingly unrelated failure.

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

* job server-build failed at build number 3680: http://172.16.20.104:8080/job/server-build/3680/

* view must-pass failed: server-build is yellow

review: Needs Fixing

[lp:~pbeaman/akiban-persistit/java7-issues]

414. By Peter Beaman on 2013-01-23

Don't interrupt a thread on close unless it is actually in an active transaction

[Peter Beaman (pbeaman)]

Server IT tests failed due to threads being unexpectedly interrupted, according to Mike. This update changes Persistit#interruptActiveThreads to interrupt only those threads engaged in active transactions, per Mike's request.

=== modified file 'src/main/java/com/persistit/Persistit.java'
--- src/main/java/com/persistit/Persistit.java	2012-12-31 01:47:18 +0000
+++ src/main/java/com/persistit/Persistit.java	2013-01-23 19:49:22 +0000
@@ -37,6 +37,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
@@ -1699,12 +1700,14 @@
         final long expires = System.currentTimeMillis() + timeout;
         boolean remaining = false;
         do {
-            final Set<SessionId> sessionIds;
+            final Map<SessionId, Transaction> copy;
             synchronized (_transactionSessionMap) {
-                sessionIds = new HashSet<SessionId>(_transactionSessionMap.keySet());
+                copy = new HashMap<SessionId, Transaction>(_transactionSessionMap);
             }
-            for (final SessionId sessionId : sessionIds) {
-                if (sessionId.isAlive()) {
+            for (final Entry<SessionId, Transaction> entry : copy.entrySet()) {
+                final SessionId sessionId = entry.getKey();
+                final Transaction txn = entry.getValue();
+                if (sessionId.isAlive() && txn.isActive() ) {
                     if (sessionId.interrupt()) {
                         _logBase.interruptedAtClose.log(sessionId.ownerName());
                     }
 
=== modified file 'src/test/java/com/persistit/MediatedFileChannelTest.java'
--- src/test/java/com/persistit/MediatedFileChannelTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/MediatedFileChannelTest.java	2013-01-23 19:49:22 +0000
@@ -84,7 +84,6 @@
             for (int i = 0; i < 65536; i++) {
                 bb.array()[i] = (byte) (i % 32 + 64);
             }
-
             final long start = System.nanoTime();
             while (errors == 0 && System.nanoTime() - start < TIME) {
                 try {
@@ -94,6 +93,7 @@
                     fc.force(true);
                     count++;
                 } catch (final InterruptedIOException e) {
+                    bb.position(0);
                     // ignore -- expected
                     interrupts++;
                     // need to clear the interrupted status
 
=== modified file 'src/test/java/com/persistit/unit/UnitTestProperties.java'
--- src/test/java/com/persistit/unit/UnitTestProperties.java	2012-08-10 16:18:11 +0000
+++ src/test/java/com/persistit/unit/UnitTestProperties.java	2013-01-23 19:49:22 +0000
@@ -41,7 +41,6 @@
         p.setProperty("journalpath", "${datapath}/persistit_journal");
         p.setProperty("logfile", "${datapath}/persistit_${timestamp}.log");
         p.setProperty("tmpvoldir", "${datapath}");
-        p.setProperty("rmiport", System.getProperty("rmiport", "8081"));
         p.setProperty("jmx", "true");
         return p;
     }
@@ -62,7 +61,6 @@
         p.setProperty("journalpath", "${datapath}/persistit_journal");
         p.setProperty("logfile", "${datapath}/persistit_${timestamp}.log");
         p.setProperty("tmpvoldir", "${datapath}");
-        p.setProperty("rmiport", System.getProperty("rmiport", "8081"));
         return p;
     }
 
@@ -78,7 +76,6 @@
         p.setProperty("journalpath", "${datapath}/persistit_alt_journal");
         p.setProperty("logfile", "${datapath}/persistit_${timestamp}.log");
         p.setProperty("tmpvoldir", "${datapath}");
-        p.setProperty("rmiport", System.getProperty("rmiport", "8081"));
         return p;
     }
 
@@ -94,8 +91,6 @@
         p.setProperty("journalpath", "${datapath}/persistit_journal");
         p.setProperty("logfile", "${datapath}/persistit_${timestamp}.log");
         p.setProperty("tmpvoldir", "${datapath}");
-        p.setProperty("rmiport", System.getProperty("rmiport", "8081"));
-        p.setProperty("jmx", "true");
         return p;
     }