Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[6918] branches/READ_CACHE
|
From: <tho...@us...> - 2013-02-20 17:47:46
|
Revision: 6918
http://bigdata.svn.sourceforge.net/bigdata/?rev=6918&view=rev
Author: thompsonbry
Date: 2013-02-20 17:47:39 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Reconciled edits with Martyn.
Modified Paths:
--------------
branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java
branches/READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
Modified: branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/AbstractJournal.java 2013-02-20 17:32:30 UTC (rev 6917)
+++ branches/READ_CACHE/bigdata/src/java/com/bigdata/journal/AbstractJournal.java 2013-02-20 17:47:39 UTC (rev 6918)
@@ -5041,15 +5041,15 @@
// Choose the "current" root block.
_rootBlock = RootBlockUtility.chooseRootBlock(rootBlock0, rootBlock1);
-
+
haLog.warn("Installed new root blocks: rootBlock0=" + rootBlock0
+ ", rootBlock1=" + rootBlock1);
// now reset the store with the root block
- if (_bufferStrategy instanceof RWStrategy)
- ((RWStrategy) _bufferStrategy).resetFromHARootBlock(_rootBlock);
+ if (_bufferStrategy instanceof IHABufferStrategy)
+ ((IHABufferStrategy) _bufferStrategy)
+ .resetFromHARootBlock(_rootBlock);
-
/*
* We need to reset the backing store with the token for the new quorum.
* There should not be any active writers since there was no quorum.
Modified: branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
===================================================================
--- branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java 2013-02-20 17:32:30 UTC (rev 6917)
+++ branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java 2013-02-20 17:47:39 UTC (rev 6918)
@@ -1895,10 +1895,9 @@
try {
// Wait long enough for the RMI request to end.
- Thread.sleep(500/* ms */);
+ Thread.sleep(250/* ms */);
} catch (InterruptedException e) {
- log.warn("Shutdown interrupted", e);
// Propagate interrupt.
Thread.currentThread().interrupt();
Modified: branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
===================================================================
--- branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java 2013-02-20 17:32:30 UTC (rev 6917)
+++ branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java 2013-02-20 17:47:39 UTC (rev 6918)
@@ -856,9 +856,7 @@
final Future<?> snd = getBufferStrategy().sendRawBuffer(req, sequence,
quorumToken, fileExtent, offset, nbytes, b);
- if (snd != null) {
- snd.get(); // wait for data sent!
- }
+ snd.get(); // wait for data sent!
remaining -= nbytes;
Modified: branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java
===================================================================
--- branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java 2013-02-20 17:32:30 UTC (rev 6917)
+++ branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java 2013-02-20 17:47:39 UTC (rev 6918)
@@ -1360,8 +1360,7 @@
log.info(e.toString());
switch (e.getState()) {
case Disconnected:
- log.warn("DISCONNECTED: " + token());
- setToken(NO_QUORUM);
+ log.warn("DISCONNECTED: " + token());
return;
case SyncConnected:
break;
@@ -1717,13 +1716,13 @@
final OrderedSetDifference<UUID> diff = new OrderedSetDifference<UUID>(
aold, anew);
for (UUID t : diff.removed()) {
- if (log.isInfoEnabled())
- log.info("removing: " + t);
+ if (log.isTraceEnabled())
+ log.trace("removing: " + t);
remove(t);
}
for (UUID t : diff.added()) {
- if (log.isInfoEnabled())
- log.info("adding: " + t);
+ if (log.isTraceEnabled())
+ log.trace("adding: " + t);
add(t);
}
}
@@ -1733,13 +1732,13 @@
final UnorderedSetDifference<UUID> diff = new UnorderedSetDifference<UUID>(
aold, anew);
for (UUID t : diff.removed()) {
- if (log.isInfoEnabled())
- log.info("removing: " + t);
+ if (log.isTraceEnabled())
+ log.trace("removing: " + t);
remove(t);
}
for (UUID t : diff.added()) {
- if (log.isInfoEnabled())
- log.info("adding: " + t);
+ if (log.isTraceEnabled())
+ log.trace("adding: " + t);
add(t);
}
}
Modified: branches/READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
===================================================================
--- branches/READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java 2013-02-20 17:32:30 UTC (rev 6917)
+++ branches/READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java 2013-02-20 17:47:39 UTC (rev 6918)
@@ -33,6 +33,7 @@
import java.security.NoSuchAlgorithmException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@@ -392,7 +393,7 @@
}
}
- });
+ }, 5, TimeUnit.SECONDS);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
