MAPREDUCE-7138. ThrottledContainerAllocator in MRAppBenchmark should implement RMHeartbeatHandler. Contributed by Oleksandr Shevchenko
(cherry picked from commit 8382b860d4
)
This commit is contained in:
parent
85ae097f3c
commit
3a13fa1b7b
|
@ -33,10 +33,12 @@ import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptContainerAssigned
|
|||
import org.apache.hadoop.mapreduce.v2.app.rm.ContainerAllocator;
|
||||
import org.apache.hadoop.mapreduce.v2.app.rm.ContainerAllocatorEvent;
|
||||
import org.apache.hadoop.mapreduce.v2.app.rm.RMContainerAllocator;
|
||||
import org.apache.hadoop.mapreduce.v2.app.rm.RMHeartbeatHandler;
|
||||
import org.apache.hadoop.mapreduce.v2.app.rm.preemption.AMPreemptionPolicy;
|
||||
import org.apache.hadoop.mapreduce.v2.app.rm.preemption.NoopAMPreemptionPolicy;
|
||||
import org.apache.hadoop.service.AbstractService;
|
||||
import org.apache.hadoop.test.GenericTestUtils;
|
||||
import org.apache.hadoop.util.Time;
|
||||
import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
|
||||
import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
|
||||
|
@ -116,7 +118,7 @@ public class MRAppBenchmark {
|
|||
}
|
||||
|
||||
class ThrottledContainerAllocator extends AbstractService
|
||||
implements ContainerAllocator {
|
||||
implements ContainerAllocator, RMHeartbeatHandler {
|
||||
private int containerCount;
|
||||
private Thread thread;
|
||||
private BlockingQueue<ContainerAllocatorEvent> eventQueue =
|
||||
|
@ -182,6 +184,15 @@ public class MRAppBenchmark {
|
|||
}
|
||||
super.serviceStop();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getLastHeartbeatTime() {
|
||||
return Time.now();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void runOnNextHeartbeat(Runnable callback) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -264,7 +275,7 @@ public class MRAppBenchmark {
|
|||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
@Test(timeout = 60000)
|
||||
public void benchmark2() throws Exception {
|
||||
int maps = 100; // Adjust for benchmarking, start with a couple of thousands
|
||||
int reduces = 50;
|
||||
|
|
Loading…
Reference in New Issue