You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/04/11 22:08:39 UTC
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 bf4d6fbbd -> 8909e1a92
refs/heads/trunk 8cd1792e1 -> 0cf35dc62
Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cf35dc6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cf35dc6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cf35dc6
Branch: refs/heads/trunk
Commit: 0cf35dc624eed8541dbc928595a7e96d94ead2bd
Parents: 8cd1792 8909e1a
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 11 15:08:31 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 11 15:08:31 2012 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/dht/RangeStreamer.java | 6 ++++-
.../apache/cassandra/io/sstable/SSTableLoader.java | 6 ++++-
.../apache/cassandra/service/StorageService.java | 19 ++++++++++++--
.../apache/cassandra/streaming/FileStreamTask.java | 7 +++++
.../cassandra/streaming/StreamInSession.java | 12 ++++++++-
5 files changed, 43 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cf35dc6/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cf35dc6/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cf35dc6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 4b12383,5e12364..4ec5de3
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1528,10 -1508,14 +1528,14 @@@ public class StorageService implements
}
}
- public void onFailure() {}
+ public void onFailure()
+ {
+ logger_.warn("Streaming from " + source + " failed");
+ onSuccess(); // calling onSuccess to send notification
+ }
};
- if (logger_.isDebugEnabled())
- logger_.debug("Requesting from " + source + " ranges " + StringUtils.join(ranges, ", "));
+ if (logger.isDebugEnabled())
+ logger.debug("Requesting from " + source + " ranges " + StringUtils.join(ranges, ", "));
StreamIn.requestRanges(source, table, ranges, callback, OperationType.RESTORE_REPLICA_COUNT);
}
}
@@@ -2891,11 -2880,15 +2900,15 @@@
latch.countDown();
}
- public void onFailure() {}
+ public void onFailure()
+ {
+ logger_.warn("Streaming from " + source + " failed");
+ onSuccess(); // calling onSuccess for latch countdown
+ }
};
- if (logger_.isDebugEnabled())
- logger_.debug("Requesting from " + source + " ranges " + StringUtils.join(toFetch, ", "));
+ if (logger.isDebugEnabled())
+ logger.debug("Requesting from " + source + " ranges " + StringUtils.join(toFetch, ", "));
// sending actual request
StreamIn.requestRanges(source, table, toFetch, callback, OperationType.BOOTSTRAP);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cf35dc6/src/java/org/apache/cassandra/streaming/FileStreamTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cf35dc6/src/java/org/apache/cassandra/streaming/StreamInSession.java
----------------------------------------------------------------------