Merge branch 'busy-repair'

twitter-archive · Mar 7, 2011 · 7a94c79 · 7a94c79
2 parents cbfcd88 + d1612f6
commit 7a94c79
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/main/scala/com/twitter/flockdb/jobs/Diff.scala b/src/main/scala/com/twitter/flockdb/jobs/Diff.scala
@@ -61,10 +61,10 @@ class Diff(shardIds: Seq[ShardId], cursor: Repair.RepairCursor, count: Int,
     log.info("DIFF [DIFFERENT] -> table id:"+tableId+" shard:"+list._1.shardInfo.id+ "+edge:"+item)
   }
 
-  override def scheduleNextRepair(lowestCursor: Repair.RepairCursor) = {
+  override def nextRepair(lowestCursor: Repair.RepairCursor) = {
     lowestCursor match {
       case Repair.END => None
-      case _ => scheduler.put(Repair.PRIORITY, new Diff(shardIds, lowestCursor, count, nameServer, scheduler))
+      case _ => Some(new Diff(shardIds, lowestCursor, count, nameServer, scheduler))
     }
   }
 }
@@ -93,10 +93,10 @@ class MetadataDiff(shardIds: Seq[ShardId], cursor: MetadataRepair.RepairCursor,
     log.info("DIFF [DIFFERENT] -> table id:"+tableId+" shard:"+list._1.shardInfo.id+" metadata:"+item)
   }
 
-  override def scheduleNextRepair(lowestCursor: MetadataRepair.RepairCursor) = {
-    lowestCursor match {
-      case MetadataRepair.END => scheduler.put(Repair.PRIORITY, new Diff(shardIds, Repair.START, Repair.COUNT, nameServer, scheduler))
-      case _ => scheduler.put(Repair.PRIORITY, new MetadataDiff(shardIds, lowestCursor, count, nameServer, scheduler))
-    }
+  override def nextRepair(lowestCursor: MetadataRepair.RepairCursor) = {
+    Some(lowestCursor match {
+      case MetadataRepair.END => new Diff(shardIds, Repair.START, Repair.COUNT, nameServer, scheduler)
+      case _ => new MetadataDiff(shardIds, lowestCursor, count, nameServer, scheduler)
+    })
   }
 }
diff --git a/src/main/scala/com/twitter/flockdb/jobs/Repair.scala b/src/main/scala/com/twitter/flockdb/jobs/Repair.scala
@@ -115,10 +115,10 @@ class Repair(shardIds: Seq[ShardId], cursor: Repair.RepairCursor, count: Int,
 
   def serialize = Map("cursor1" -> cursor._1.position, "cursor2" -> cursor._2.position)
 
-  def scheduleNextRepair(lowestCursor: Repair.RepairCursor) = {
+  def nextRepair(lowestCursor: Repair.RepairCursor) = {
     lowestCursor match {
       case Repair.END => None
-      case _ => scheduler.put(Repair.PRIORITY, new Repair(shardIds, lowestCursor, count, nameServer, scheduler))
+      case _ => Some(new Repair(shardIds, lowestCursor, count, nameServer, scheduler))
     }
   }
 }
@@ -147,8 +147,8 @@ class MetadataRepair(shardIds: Seq[ShardId], cursor: MetadataRepair.RepairCursor
 
   override def label = "MetadataRepair"
 
-  def scheduleNextRepair(lowestCursor: MetadataRepair.RepairCursor) = {
-    scheduler.put(Repair.PRIORITY, lowestCursor match {
+  def nextRepair(lowestCursor: MetadataRepair.RepairCursor) = {
+    Some(lowestCursor match {
       case MetadataRepair.END => new Repair(shardIds, Repair.START, Repair.COUNT, nameServer, scheduler)
       case _ => new MetadataRepair(shardIds, lowestCursor, count, nameServer, scheduler)
     })