Merge pull request #34 from OferMania/plus1

Adds deterministic id selection for BackupSelector

Author: syang0

src/AbstractLogTest.cc

@@ -57,7 +57,7 @@ class AbstractLogTest : public ::testing::Test {
  serverId(ServerId(57, 0)),
  serverList(&context),
  serverConfig(ServerConfig::forTesting()),
- replicaManager(&context, &serverId, 0, false, false),
+ replicaManager(&context, &serverId, 0, false, false, false),
  masterTableMetadata(),
  allocator(&serverConfig),
  segmentManager(&context, &serverConfig, &serverId,

src/BackupSelector.cc

@@ -61,6 +61,7 @@ BackupSelector::BackupSelector(Context* context, const ServerId* serverId,
  , allowLocalBackup(allowLocalBackup)
  , replicationIdMap()
  , okToLogNextProblem(true)
+ , maxAttempts(100)
 {
 }
 
@@ -119,8 +120,8 @@ ServerId
 BackupSelector::selectSecondary(uint32_t numBackups,
  const ServerId backupIds[])
 {
- int attempts;
- for (attempts = 0; attempts < 100; attempts++) {
+ uint32_t attempts = 0;
+ for (attempts = 0; attempts < maxAttempts; attempts++) {
  applyTrackerChanges();
  ServerId id = tracker.getRandomServerIdWithService(
  WireFormat::BACKUP_SERVICE);

src/BackupSelector.h

@@ -123,6 +123,12 @@ class BackupSelector : public BaseBackupSelector {
  */
  bool okToLogNextProblem;
 
+ /**
+ * Indicates the maximum number of attempts to find a secondary 
+ * serverId.
+ */
+ const uint32_t maxAttempts;
+
  PRIVATE:
  bool conflict(const ServerId backupId,
  const ServerId otherBackupId) const;

src/CleanableSegmentManagerTest.cc

@@ -96,7 +96,7 @@ class CleanableSegmentManagerTest : public ::testing::Test {
  serverId(ServerId(57, 0)),
  serverList(&context),
  serverConfig(),
- replicaManager(&context, &serverId, 0, false, false),
+ replicaManager(&context, &serverId, 0, false, false, false),
  allocator(serverConfig()),
  masterTableMetadata(),
  segmentManager(&context, serverConfig(), &serverId,

src/LockTableTest.cc

@@ -49,7 +49,7 @@ class LockTableTest : public ::testing::Test {
  , serverId(ServerId(57, 0))
  , serverList(&context)
  , serverConfig(ServerConfig::forTesting())
- , replicaManager(&context, &serverId, 0, false, false)
+ , replicaManager(&context, &serverId, 0, false, false, false)
  , masterTableMetadata()
  , allocator(&serverConfig)
  , segmentManager(&context, &serverConfig, &serverId,

src/LogCleanerTest.cc

@@ -108,7 +108,7 @@ class LogCleanerTest : public ::testing::Test {
  serverList(&context),
  masterTableMetadata(),
  serverConfig(),
- replicaManager(&context, &serverId, 0, false, false),
+ replicaManager(&context, &serverId, 0, false, false, false),
  allocator(serverConfig()),
  segmentManager(&context, serverConfig(), &serverId,
  allocator, replicaManager, &masterTableMetadata),

src/LogEntryRelocatorTest.cc

@@ -42,7 +42,7 @@ class LogEntryRelocatorTest : public ::testing::Test {
  serverId(ServerId(57, 0)),
  serverList(&context),
  serverConfig(ServerConfig::forTesting()),
- replicaManager(&context, &serverId, 0, false, false),
+ replicaManager(&context, &serverId, 0, false, false, false),
  masterTableMetadata(),
  allocator(&serverConfig),
  segmentManager(&context, &serverConfig, &serverId,

src/LogIteratorTest.cc

@@ -57,7 +57,7 @@ class LogIteratorTest : public ::testing::Test {
  serverId(ServerId(57, 0)),
  serverList(&context),
  serverConfig(ServerConfig::forTesting()),
- replicaManager(&context, &serverId, 0, false, false),
+ replicaManager(&context, &serverId, 0, false, false, false),
  masterTableMetadata(),
  allocator(&serverConfig),
  segmentManager(&context, &serverConfig, &serverId,

src/LogTest.cc

@@ -59,7 +59,7 @@ class LogTest : public ::testing::Test {
  serverId(ServerId(57, 0)),
  serverList(&context),
  serverConfig(ServerConfig::forTesting()),
- replicaManager(&context, &serverId, 0, false, false),
+ replicaManager(&context, &serverId, 0, false, false, false),
  masterTableMetadata(),
  allocator(&serverConfig),
  segmentManager(&context, &serverConfig, &serverId,

src/Makefrag

@@ -124,6 +124,7 @@ SHARED_SRCFILES := \
  src/PcapFile.cc \
  src/PerfCounter.cc \
  src/PerfStats.cc \
+ src/PlusOneBackupSelector.cc \
  src/PortAlarm.cc \
  src/PreparedOp.cc \
  src/RamCloud.cc \