when we select peers to test, lets use all of the reliable peers, not just well integrated peers
This commit is contained in:
@ -79,7 +79,9 @@ class PeerManager {
|
|||||||
Set curVals = new HashSet(criteria.getMinimumRequired());
|
Set curVals = new HashSet(criteria.getMinimumRequired());
|
||||||
switch (criteria.getPurpose()) {
|
switch (criteria.getPurpose()) {
|
||||||
case PeerSelectionCriteria.PURPOSE_TEST:
|
case PeerSelectionCriteria.PURPOSE_TEST:
|
||||||
_organizer.selectWellIntegratedPeers(criteria.getMinimumRequired(), exclude, curVals);
|
// for now, the peers we test will be the reliable ones
|
||||||
|
//_organizer.selectWellIntegratedPeers(criteria.getMinimumRequired(), exclude, curVals);
|
||||||
|
_organizer.selectReliablePeers(criteria.getMinimumRequired(), exclude, curVals);
|
||||||
break;
|
break;
|
||||||
case PeerSelectionCriteria.PURPOSE_TUNNEL:
|
case PeerSelectionCriteria.PURPOSE_TUNNEL:
|
||||||
_organizer.selectFastAndReliablePeers(criteria.getMinimumRequired(), exclude, curVals);
|
_organizer.selectFastAndReliablePeers(criteria.getMinimumRequired(), exclude, curVals);
|
||||||
@ -95,7 +97,11 @@ class PeerManager {
|
|||||||
}
|
}
|
||||||
if (curVals.size() <= 0) {
|
if (curVals.size() <= 0) {
|
||||||
if (_log.shouldLog(Log.WARN))
|
if (_log.shouldLog(Log.WARN))
|
||||||
_log.warn("We ran out of peers when looking for reachable ones after finding " + rv.size());
|
_log.warn("We ran out of peers when looking for reachable ones after finding "
|
||||||
|
+ rv.size() + " with "
|
||||||
|
+ _organizer.countWellIntegratedPeers() + "/"
|
||||||
|
+ _organizer.countReliablePeers() + "/"
|
||||||
|
+ _organizer.countFastAndReliablePeers() + " integrated/reliable/fast peers");
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
for (Iterator iter = curVals.iterator(); iter.hasNext(); ) {
|
for (Iterator iter = curVals.iterator(); iter.hasNext(); ) {
|
||||||
|
Reference in New Issue
Block a user