From 8c6ad36b5e38c0567105e4dc15f87766b8ac904c Mon Sep 17 00:00:00 2001
From: Pradyumna Kaushik <pkaushi1@binghamton.edu>
Date: Sun, 15 Jan 2017 15:23:57 -0500
Subject: [PATCH] changed name of StartLogAndDynamicCap(...) to
StartPCPLogAndExtremaDynamicCap(...).]
---
pcp/loganddynamiccap.go | 2 +-
scheduler.go | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pcp/loganddynamiccap.go b/pcp/loganddynamiccap.go
index a9a3f1f..c6ae8f5 100644
--- a/pcp/loganddynamiccap.go
+++ b/pcp/loganddynamiccap.go
@@ -57,7 +57,7 @@ func meanCluster(history *ring.Ring) float64 {
return (total / count)
}
-func StartLogAndDynamicCap(quit chan struct{}, logging *bool, prefix string, hiThreshold, loThreshold float64) {
+func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, prefix string, hiThreshold, loThreshold float64) {
const pcpCommand string = "pmdumptext -m -l -f '' -t 1.0 -d , -c config"
cmd := exec.Command("sh", "-c", pcpCommand)
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
diff --git a/scheduler.go b/scheduler.go
index 25b796f..0041939 100644
--- a/scheduler.go
+++ b/scheduler.go
@@ -58,7 +58,7 @@ func main() {
startTime := time.Now().Format("20060102150405")
logPrefix := *pcplogPrefix + "_" + startTime
- scheduler := schedulers.NewFirstFitSortedWattsClassMapWatts(tasks, *ignoreWatts, logPrefix)
+ scheduler := schedulers.NewFirstFitSortedWattsReducedWAR(tasks, *ignoreWatts, logPrefix)
driver, err := sched.NewMesosSchedulerDriver(sched.DriverConfig{
Master: *master,
Framework: &mesos.FrameworkInfo{
@@ -72,8 +72,8 @@ func main() {
return
}
- go pcp.Start(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix)
- //go pcp.StartLogAndDynamicCap(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix, *hiThreshold, *loThreshold)
+ //go pcp.Start(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix)
+ go pcp.StartPCPLogAndExtremaDynamicCap(scheduler.PCPLog, &scheduler.RecordPCP, logPrefix, *hiThreshold, *loThreshold)
time.Sleep(1 * time.Second) // Take a second between starting PCP log and continuing
// Attempt to handle signint to not leave pmdumptext running