removed commented lines. Changed the scheduler to BinPackedSortedWattsSortedOffers.

This commit is contained in:
Pradyumna Kaushik 2017-01-28 17:48:15 -05:00
parent e60488f965
commit 6b0f4e3729

View file

@ -58,7 +58,7 @@ func main() {
startTime := time.Now().Format("20060102150405") startTime := time.Now().Format("20060102150405")
logPrefix := *pcplogPrefix + "_" + startTime logPrefix := *pcplogPrefix + "_" + startTime
scheduler := schedulers.NewFirstFitSortedWattsReducedWAR(tasks, *ignoreWatts, logPrefix) scheduler := schedulers.NewBinPackSortedWattsSortedOffers(tasks, *ignoreWatts, logPrefix)
driver, err := sched.NewMesosSchedulerDriver(sched.DriverConfig{ driver, err := sched.NewMesosSchedulerDriver(sched.DriverConfig{
Master: *master, Master: *master,
Framework: &mesos.FrameworkInfo{ Framework: &mesos.FrameworkInfo{
@ -72,8 +72,8 @@ func main() {
return return
} }
//go pcp.Start(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix) go pcp.Start(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix)
go pcp.StartPCPLogAndExtremaDynamicCap(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix, *hiThreshold, *loThreshold) //go pcp.StartPCPLogAndExtremaDynamicCap(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix, *hiThreshold, *loThreshold)
time.Sleep(1 * time.Second) // Take a second between starting PCP log and continuing time.Sleep(1 * time.Second) // Take a second between starting PCP log and continuing
// Attempt to handle signint to not leave pmdumptext running // Attempt to handle signint to not leave pmdumptext running
@ -96,7 +96,7 @@ func main() {
// Signals we have scheduled every task we have // Signals we have scheduled every task we have
select { select {
case <-scheduler.Shutdown: case <-scheduler.Shutdown:
// case <-time.After(shutdownTimeout): //case <-time.After(shutdownTimeout):
} }
// All tasks have finished // All tasks have finished
@ -104,7 +104,7 @@ func main() {
case <-scheduler.Done: case <-scheduler.Done:
close(scheduler.PCPLog) close(scheduler.PCPLog)
time.Sleep(5 * time.Second) //Wait for PCP to log a few more seconds time.Sleep(5 * time.Second) //Wait for PCP to log a few more seconds
// case <-time.After(shutdownTimeout): //case <-time.After(shutdownTimeout):
} }
// Done shutting down // Done shutting down