diff --git a/constants/constants.go b/constants/constants.go
index 6eb7f11..fb85d21 100644
--- a/constants/constants.go
+++ b/constants/constants.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
// TODO: Clean this up and use Mesos Attributes instead.
package constants
diff --git a/def/metric.go b/def/metric.go
index e0c61c1..2bde309 100644
--- a/def/metric.go
+++ b/def/metric.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package def
diff --git a/def/sortingCriteria.go b/def/sortingCriteria.go
index 60e9ac6..427b912 100644
--- a/def/sortingCriteria.go
+++ b/def/sortingCriteria.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package def
diff --git a/def/task.go b/def/task.go
index 015171e..af579d9 100644
--- a/def/task.go
+++ b/def/task.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package def
diff --git a/def/taskUtils.go b/def/taskUtils.go
index ba019e2..734814a 100644
--- a/def/taskUtils.go
+++ b/def/taskUtils.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package def
@@ -25,9 +25,9 @@ import (
"github.com/mash/gokmeans"
"github.com/montanaflynn/stats"
- "github.com/spdfg/elektron/elektronLogging"
+ log "github.com/sirupsen/logrus"
+ "github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
)
// Information about a cluster of tasks.
@@ -52,8 +52,8 @@ func (tc TasksToClassify) taskObservationCalculator(task Task) []float64 {
} else if task.Watts != 0.0 {
return []float64{task.Watts}
} else {
- elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.FatalLevel,
- log.Fields {}, "Unable to classify tasks. Missing Watts or ClassToWatts attribute in workload")
+ elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.FatalLevel,
+ log.Fields{}, "Unable to classify tasks. Missing Watts or ClassToWatts attribute in workload")
return []float64{0.0} // Won't reach here.
}
}
@@ -108,8 +108,8 @@ func clusterSizeAvgMMMPU(tasks []Task, taskObservation func(task Task) []float64
} else {
// skip this value
// there is an error in the task config.
- elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.ErrorLevel,
- log.Fields {}, fmt.Sprintf("%s",err))
+ elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.ErrorLevel,
+ log.Fields{}, fmt.Sprintf("%s", err))
}
} else {
// There is only one observation for the task.
diff --git a/elektronLogging/ElektronFormatter.go b/elektronLogging/ElektronFormatter.go
index 0293510..265d73b 100644
--- a/elektronLogging/ElektronFormatter.go
+++ b/elektronLogging/ElektronFormatter.go
@@ -3,9 +3,9 @@ package elektronLogging
import (
"bytes"
"fmt"
+ "github.com/fatih/color"
+ log "github.com/sirupsen/logrus"
"strings"
- "github.com/fatih/color"
- log "github.com/sirupsen/logrus"
)
type ElektronFormatter struct {
@@ -13,18 +13,18 @@ type ElektronFormatter struct {
}
func (f ElektronFormatter) getColor(entry *log.Entry) *color.Color {
- switch entry.Level {
- case log.InfoLevel:
- return color.New(color.FgGreen, color.Bold)
- case log.WarnLevel:
- return color.New(color.FgYellow, color.Bold)
- case log.ErrorLevel:
- return color.New(color.FgRed, color.Bold)
- case log.FatalLevel:
- return color.New(color.FgRed, color.Bold)
- default:
- return color.New(color.FgWhite, color.Bold)
- }
+ switch entry.Level {
+ case log.InfoLevel:
+ return color.New(color.FgGreen, color.Bold)
+ case log.WarnLevel:
+ return color.New(color.FgYellow, color.Bold)
+ case log.ErrorLevel:
+ return color.New(color.FgRed, color.Bold)
+ case log.FatalLevel:
+ return color.New(color.FgRed, color.Bold)
+ default:
+ return color.New(color.FgWhite, color.Bold)
+ }
}
func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) {
var b *bytes.Buffer
@@ -35,19 +35,18 @@ func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) {
b = &bytes.Buffer{}
}
- levelColor := f.getColor(entry)
- level := levelColor.Sprintf("[%s]:",strings.ToUpper(entry.Level.String()))
- message := fmt.Sprintf("%s %s ",level,entry.Time.Format(f.TimestampFormat))
- if entry.Message != "" {
- message = fmt.Sprintf("%s %s %s ",level,entry.Time.Format(f.TimestampFormat), entry.Message)
- }
+ levelColor := f.getColor(entry)
+ level := levelColor.Sprintf("[%s]:", strings.ToUpper(entry.Level.String()))
+ message := fmt.Sprintf("%s %s ", level, entry.Time.Format(f.TimestampFormat))
+ if entry.Message != "" {
+ message = fmt.Sprintf("%s %s %s ", level, entry.Time.Format(f.TimestampFormat), entry.Message)
+ }
var formattedFields []string
for key, value := range entry.Data {
- formattedFields = append(formattedFields,
- strings.Join([]string{key, fmt.Sprintf("%s", value)}, "="))
+ formattedFields = append(formattedFields,
+ strings.Join([]string{key, fmt.Sprintf("%s", value)}, "="))
}
-
-
+
b.WriteString(message)
b.WriteString(strings.Join(formattedFields, ", "))
b.WriteByte('\n')
diff --git a/elektronLogging/clsfnTaskDistOverheadLogger.go b/elektronLogging/clsfnTaskDistOverheadLogger.go
index c4a5e70..749c776 100644
--- a/elektronLogging/clsfnTaskDistOverheadLogger.go
+++ b/elektronLogging/clsfnTaskDistOverheadLogger.go
@@ -1,8 +1,8 @@
package elektronLogging
import (
- "os"
log "github.com/sirupsen/logrus"
+ "os"
)
type ClsfnTaskDistOverheadLogger struct {
@@ -16,16 +16,16 @@ func NewClsfnTaskDistOverheadLogger(logType int, prefix string) *ClsfnTaskDistOv
return cLog
}
-func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level log.Level, logData log.Fields,message string) {
+func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if cLog.Type == logType {
logger.SetLevel(level)
-
- if cLog.AllowOnConsole {
- logger.SetOutput(os.Stdout)
- logger.WithFields(logData).Println(message)
- }
-
+
+ if cLog.AllowOnConsole {
+ logger.SetOutput(os.Stdout)
+ logger.WithFields(logData).Println(message)
+ }
+
logger.SetOutput(cLog.LogFileName)
logger.WithFields(logData).Println(message)
}
@@ -44,6 +44,6 @@ func (cLog *ClsfnTaskDistOverheadLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err)
} else {
cLog.LogFileName = logFile
- cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole
+ cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole
}
}
diff --git a/elektronLogging/consoleLogger.go b/elektronLogging/consoleLogger.go
index 36feb15..0801295 100644
--- a/elektronLogging/consoleLogger.go
+++ b/elektronLogging/consoleLogger.go
@@ -1,8 +1,8 @@
package elektronLogging
import (
- "os"
log "github.com/sirupsen/logrus"
+ "os"
)
type ConsoleLogger struct {
@@ -20,10 +20,10 @@ func (cLog *ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
//logFields := cloneFields(logData)
logger.SetLevel(level)
-
+
logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message)
-
+
logger.SetOutput(cLog.LogFileName)
logger.WithFields(logData).Println(message)
}
@@ -42,6 +42,6 @@ func (cLog *ConsoleLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err)
} else {
cLog.LogFileName = logFile
- cLog.AllowOnConsole = true
+ cLog.AllowOnConsole = true
}
}
diff --git a/elektronLogging/createLogDir.go b/elektronLogging/createLogDir.go
index b365396..397a2a7 100644
--- a/elektronLogging/createLogDir.go
+++ b/elektronLogging/createLogDir.go
@@ -1,10 +1,10 @@
package elektronLogging
import (
+ logrus "github.com/sirupsen/logrus"
"os"
"strconv"
"time"
- logrus "github.com/sirupsen/logrus"
)
var logDir string
diff --git a/elektronLogging/logger.go b/elektronLogging/logger.go
index 593f217..94e4b62 100644
--- a/elektronLogging/logger.go
+++ b/elektronLogging/logger.go
@@ -1,11 +1,11 @@
package elektronLogging
import (
- "time"
- "fmt"
- "strconv"
- . "github.com/spdfg/elektron/elektronLogging/types"
+ "fmt"
log "github.com/sirupsen/logrus"
+ . "github.com/spdfg/elektron/elektronLogging/types"
+ "strconv"
+ "time"
)
var config LoggerConfig
@@ -14,25 +14,25 @@ var formatter ElektronFormatter
func BuildLogger() *LoggerImpl {
- // read configuration from yaml
+ // read configuration from yaml
config.GetConfig()
-
- // create the log directory
+
+ // create the log directory
startTime := time.Now()
formatter.TimestampFormat = "2006-01-02 15:04:05"
GetLogDir(startTime, "_")
- prefix := fmt.Sprintf("_%d%d%s%s%s%s",startTime.Year(), startTime.Month(),strconv.Itoa(startTime.Day()),
- strconv.Itoa(startTime.Hour()),strconv.Itoa(startTime.Minute()),strconv.Itoa(startTime.Second()))
-
- //create a single logrus instance and set its formatter to ElektronFormatter
+ prefix := fmt.Sprintf("_%d%d%s%s%s%s", startTime.Year(), startTime.Month(), strconv.Itoa(startTime.Day()),
+ strconv.Itoa(startTime.Hour()), strconv.Itoa(startTime.Minute()), strconv.Itoa(startTime.Second()))
+
+ //create a single logrus instance and set its formatter to ElektronFormatter
logger = log.New()
logger.SetFormatter(&formatter)
- // create a chain of loggers
+ // create a chain of loggers
head := new(LoggerImpl)
- cLog := NewConsoleLogger(CONSOLE,prefix)
- pLog := NewPcpLogger(PCP,prefix)
+ cLog := NewConsoleLogger(CONSOLE, prefix)
+ pLog := NewPcpLogger(PCP, prefix)
schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix)
spsLog := NewSchedPolicySwitchLogger(SPS, prefix)
schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix)
diff --git a/elektronLogging/loggerChain.go b/elektronLogging/loggerChain.go
index baac3d5..236f2fa 100644
--- a/elektronLogging/loggerChain.go
+++ b/elektronLogging/loggerChain.go
@@ -12,10 +12,10 @@ type Logger interface {
SetLogFile(prefix string)
}
type LoggerImpl struct {
- Type int
- AllowOnConsole bool
- LogFileName *os.File
- next Logger
+ Type int
+ AllowOnConsole bool
+ LogFileName *os.File
+ next Logger
}
func (l *LoggerImpl) SetNext(logType Logger) {
diff --git a/elektronLogging/loggerConfig.go b/elektronLogging/loggerConfig.go
index cc9ece5..790669e 100644
--- a/elektronLogging/loggerConfig.go
+++ b/elektronLogging/loggerConfig.go
@@ -1,68 +1,68 @@
package elektronLogging
+
import (
- "gopkg.in/yaml.v2"
- "io/ioutil"
- log "github.com/sirupsen/logrus"
- elekEnv "github.com/spdfg/elektron/environment"
+ log "github.com/sirupsen/logrus"
+ elekEnv "github.com/spdfg/elektron/environment"
+ "gopkg.in/yaml.v2"
+ "io/ioutil"
)
type LoggerConfig struct {
-
SchedTraceConfig struct {
- Enabled bool `yaml:"enabled"`
- FilenameExtension string `yaml:"filenameExtension"`
- EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
- AllowOnConsole bool `yaml:"allowOnConsole"`
+ Enabled bool `yaml:"enabled"`
+ FilenameExtension string `yaml:"filenameExtension"`
+ EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
+ AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"schedTrace"`
PCPConfig struct {
- Enabled bool `yaml:"enabled"`
- FilenameExtension string `yaml:"filenameExtension"`
- EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
- AllowOnConsole bool `yaml:"allowOnConsole"`
+ Enabled bool `yaml:"enabled"`
+ FilenameExtension string `yaml:"filenameExtension"`
+ EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
+ AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"pcp"`
ConsoleConfig struct {
- Enabled bool `yaml:"enabled"`
- FilenameExtension string `yaml:"filenameExtension"`
- EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
- MinLogLevel string `yaml:"minLogLevel"`
+ Enabled bool `yaml:"enabled"`
+ FilenameExtension string `yaml:"filenameExtension"`
+ EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
+ MinLogLevel string `yaml:"minLogLevel"`
} `yaml:"console"`
SPSConfig struct {
- Enabled bool `yaml:"enabled"`
- FilenameExtension string `yaml:"filenameExtension"`
- EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
- AllowOnConsole bool `yaml:"allowOnConsole"`
+ Enabled bool `yaml:"enabled"`
+ FilenameExtension string `yaml:"filenameExtension"`
+ EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
+ AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"sps"`
TaskDistConfig struct {
- Enabled bool `yaml:"enabled"`
- FilenameExtension string `yaml:"filenameExtension"`
- EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
- AllowOnConsole bool `yaml:"allowOnConsole"`
+ Enabled bool `yaml:"enabled"`
+ FilenameExtension string `yaml:"filenameExtension"`
+ EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
+ AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"clsfnTaskDistOverhead"`
-
+
SchedWindowConfig struct {
- Enabled bool `yaml:"enabled"`
- FilenameExtension string `yaml:"filenameExtension"`
- EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
- AllowOnConsole bool `yaml:"allowOnConsole"`
+ Enabled bool `yaml:"enabled"`
+ FilenameExtension string `yaml:"filenameExtension"`
+ EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
+ AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"schedWindow"`
-
- Format[] string `yaml:"format"`
+
+ Format []string `yaml:"format"`
}
func (c *LoggerConfig) GetConfig() *LoggerConfig {
- yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml)
- if err != nil {
- log.Printf("yamlFile.Get err #%v ", err)
- }
- err = yaml.Unmarshal(yamlFile, c)
- if err != nil {
- log.Fatalf("Unmarshal: %v", err)
- }
+ yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml)
+ if err != nil {
+ log.Printf("yamlFile.Get err #%v ", err)
+ }
+ err = yaml.Unmarshal(yamlFile, c)
+ if err != nil {
+ log.Fatalf("Unmarshal: %v", err)
+ }
- return c
+ return c
}
diff --git a/elektronLogging/pcpLogger.go b/elektronLogging/pcpLogger.go
index 3d7c720..4969054 100644
--- a/elektronLogging/pcpLogger.go
+++ b/elektronLogging/pcpLogger.go
@@ -1,8 +1,8 @@
package elektronLogging
import (
- "os"
log "github.com/sirupsen/logrus"
+ "os"
)
type PcpLogger struct {
@@ -20,11 +20,11 @@ func (pLog *PcpLogger) Log(logType int, level log.Level, logData log.Fields, mes
if pLog.Type == logType {
logger.SetLevel(level)
-
- if pLog.AllowOnConsole {
- logger.SetOutput(os.Stdout)
- logger.WithFields(logData).Println(message)
- }
+
+ if pLog.AllowOnConsole {
+ logger.SetOutput(os.Stdout)
+ logger.WithFields(logData).Println(message)
+ }
logger.SetOutput(pLog.LogFileName)
logger.WithFields(logData).Println(message)
@@ -44,6 +44,6 @@ func (plog *PcpLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err)
} else {
plog.LogFileName = logFile
- plog.AllowOnConsole = config.PCPConfig.AllowOnConsole
+ plog.AllowOnConsole = config.PCPConfig.AllowOnConsole
}
}
diff --git a/elektronLogging/schedPolicySwitchLogger.go b/elektronLogging/schedPolicySwitchLogger.go
index 270b5f8..d2d41a0 100644
--- a/elektronLogging/schedPolicySwitchLogger.go
+++ b/elektronLogging/schedPolicySwitchLogger.go
@@ -1,8 +1,8 @@
package elektronLogging
import (
- "os"
log "github.com/sirupsen/logrus"
+ "os"
)
type SchedPolicySwitchLogger struct {
@@ -20,11 +20,11 @@ func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData l
if sLog.Type == logType {
logger.SetLevel(level)
-
- if sLog.AllowOnConsole {
- logger.SetOutput(os.Stdout)
- logger.WithFields(logData).Println(message)
- }
+
+ if sLog.AllowOnConsole {
+ logger.SetOutput(os.Stdout)
+ logger.WithFields(logData).Println(message)
+ }
logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message)
@@ -44,6 +44,6 @@ func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err)
} else {
sLog.LogFileName = logFile
- sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole
+ sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole
}
}
diff --git a/elektronLogging/schedTraceLogger.go b/elektronLogging/schedTraceLogger.go
index 0aade97..238c8e6 100644
--- a/elektronLogging/schedTraceLogger.go
+++ b/elektronLogging/schedTraceLogger.go
@@ -1,8 +1,8 @@
package elektronLogging
import (
- "os"
log "github.com/sirupsen/logrus"
+ "os"
)
type SchedTraceLogger struct {
@@ -20,12 +20,12 @@ func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fiel
if sLog.Type == logType {
logger.SetLevel(level)
-
- if sLog.AllowOnConsole {
- logger.SetOutput(os.Stdout)
- logger.WithFields(logData).Println(message)
- }
-
+
+ if sLog.AllowOnConsole {
+ logger.SetOutput(os.Stdout)
+ logger.WithFields(logData).Println(message)
+ }
+
logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message)
}
@@ -44,6 +44,6 @@ func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err)
} else {
sLog.LogFileName = logFile
- sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole
+ sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole
}
}
diff --git a/elektronLogging/schedWindowLogger.go b/elektronLogging/schedWindowLogger.go
index 8640883..9439698 100644
--- a/elektronLogging/schedWindowLogger.go
+++ b/elektronLogging/schedWindowLogger.go
@@ -1,8 +1,8 @@
package elektronLogging
import (
- "os"
log "github.com/sirupsen/logrus"
+ "os"
)
type SchedWindowLogger struct {
@@ -21,10 +21,10 @@ func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fie
logger.SetLevel(level)
if sLog.AllowOnConsole {
- logger.SetOutput(os.Stdout)
- logger.WithFields(logData).Println(message)
- }
-
+ logger.SetOutput(os.Stdout)
+ logger.WithFields(logData).Println(message)
+ }
+
logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message)
}
@@ -43,6 +43,6 @@ func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err)
} else {
sLog.LogFileName = logFile
- sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole
+ sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole
}
}
diff --git a/elektronLogging/types/types.go b/elektronLogging/types/types.go
index e8288c1..0dd7fec 100644
--- a/elektronLogging/types/types.go
+++ b/elektronLogging/types/types.go
@@ -1,16 +1,14 @@
package elektronLogging
-
const (
- ERROR = iota
- WARNING = iota
- GENERAL = iota
- SUCCESS = iota
- CONSOLE = iota
- PCP = iota
- SCHED_TRACE = iota
- SPS = iota
- SCHED_WINDOW = iota
- CLSFN_TASKDIST_OVERHEAD = iota
+ ERROR = iota
+ WARNING = iota
+ GENERAL = iota
+ SUCCESS = iota
+ CONSOLE = iota
+ PCP = iota
+ SCHED_TRACE = iota
+ SPS = iota
+ SCHED_WINDOW = iota
+ CLSFN_TASKDIST_OVERHEAD = iota
)
-
diff --git a/environment/env.go b/environment/env.go
index d7c465d..c1abed1 100644
--- a/environment/env.go
+++ b/environment/env.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package environment
diff --git a/pcp/pcp.go b/pcp/pcp.go
index 928d5a3..f1ff505 100644
--- a/pcp/pcp.go
+++ b/pcp/pcp.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package pcp
@@ -24,12 +24,12 @@ import (
"syscall"
"time"
- "github.com/spdfg/elektron/elektronLogging"
+ log "github.com/sirupsen/logrus"
+ "github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
)
-func Start(quit chan struct{}, logging *bool,pcpConfigFile string) {
+func Start(quit chan struct{}, logging *bool, pcpConfigFile string) {
var pcpCommand string = "pmdumptext -m -l -f '' -t 1.0 -d , -c " + pcpConfigFile
cmd := exec.Command("sh", "-c", pcpCommand)
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
@@ -47,9 +47,9 @@ func Start(quit chan struct{}, logging *bool,pcpConfigFile string) {
scanner.Scan()
// Write to logfile
- elektronLogging.ElektronLog.Log(elekLogT.PCP,
- log.InfoLevel,
- log.Fields {}, scanner.Text())
+ elektronLogging.ElektronLog.Log(elekLogT.PCP,
+ log.InfoLevel,
+ log.Fields{}, scanner.Text())
// Throw away first set of results
scanner.Scan()
@@ -60,18 +60,18 @@ func Start(quit chan struct{}, logging *bool,pcpConfigFile string) {
text := scanner.Text()
if *logging {
- elektronLogging.ElektronLog.Log(elekLogT.PCP,
- log.InfoLevel,
- log.Fields {}, text)
+ elektronLogging.ElektronLog.Log(elekLogT.PCP,
+ log.InfoLevel,
+ log.Fields{}, text)
}
seconds++
}
}(logging)
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel,
- log.Fields {}, "PCP logging started")
+ log.Fields{}, "PCP logging started")
if err := cmd.Start(); err != nil {
log.Fatal(err)
@@ -81,9 +81,9 @@ func Start(quit chan struct{}, logging *bool,pcpConfigFile string) {
select {
case <-quit:
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Stopping PCP logging in 5 seconds")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, "Stopping PCP logging in 5 seconds")
time.Sleep(5 * time.Second)
// http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly
diff --git a/pcp/utils.go b/pcp/utils.go
index 3db92b6..bb52027 100644
--- a/pcp/utils.go
+++ b/pcp/utils.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package pcp
diff --git a/pcp/victim.go b/pcp/victim.go
index e18ec48..a5f59fe 100644
--- a/pcp/victim.go
+++ b/pcp/victim.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package pcp
diff --git a/powerCap/extrema.go b/powerCap/extrema.go
index e3b683d..0978249 100644
--- a/powerCap/extrema.go
+++ b/powerCap/extrema.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package powerCap
@@ -29,14 +29,14 @@ import (
"syscall"
"time"
+ log "github.com/sirupsen/logrus"
+ "github.com/spdfg/elektron/elektronLogging"
+ elekLogT "github.com/spdfg/elektron/elektronLogging/types"
"github.com/spdfg/elektron/pcp"
"github.com/spdfg/elektron/rapl"
- "github.com/spdfg/elektron/elektronLogging"
- elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
)
-func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThreshold, loThreshold float64,pcpConfigFile string) {
+func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThreshold, loThreshold float64, pcpConfigFile string) {
var pcpCommand string = "pmdumptext -m -l -f '' -t 1.0 -d , -c " + pcpConfigFile
cmd := exec.Command("sh", "-c", pcpCommand, pcpConfigFile)
@@ -44,8 +44,8 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
if hiThreshold < loThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "High threshold is lower than low threshold!")
+ log.InfoLevel,
+ log.Fields{}, "High threshold is lower than low threshold!")
}
pipe, err := cmd.StdoutPipe()
@@ -61,9 +61,9 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
scanner.Scan()
// Write to logfile
- elektronLogging.ElektronLog.Log(elekLogT.PCP,
- log.InfoLevel,
- log.Fields {}, scanner.Text())
+ elektronLogging.ElektronLog.Log(elekLogT.PCP,
+ log.InfoLevel,
+ log.Fields{}, scanner.Text())
headers := strings.Split(scanner.Text(), ",")
@@ -98,17 +98,17 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
for scanner.Scan() {
if *logging {
-
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Logging PCP...")
+
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, "Logging PCP...")
text := scanner.Text()
split := strings.Split(text, ",")
-
- elektronLogging.ElektronLog.Log(elekLogT.PCP,
- log.InfoLevel,
- log.Fields {}, text)
+
+ elektronLogging.ElektronLog.Log(elekLogT.PCP,
+ log.InfoLevel,
+ log.Fields{}, text)
totalPower := 0.0
for _, powerIndex := range powerIndexes {
@@ -119,10 +119,10 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
powerHistories[host].Value = power
powerHistories[host] = powerHistories[host].Next()
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Host" : fmt.Sprintf("%s",indexToHost[powerIndex]), "Power" : fmt.Sprintf("%f",(power * pcp.RAPLUnits))},
- "")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{"Host": fmt.Sprintf("%s", indexToHost[powerIndex]), "Power": fmt.Sprintf("%f", (power * pcp.RAPLUnits))},
+ "")
totalPower += power
}
@@ -134,15 +134,15 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
clusterMean := pcp.AverageClusterPowerHistory(clusterPowerHist)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Total power" : fmt.Sprintf("%f %d",clusterPower,clusterPowerHist.Len()),
- "Sec Avg" : fmt.Sprintf("%f",clusterMean)},
- "")
+ log.InfoLevel,
+ log.Fields{"Total power": fmt.Sprintf("%f %d", clusterPower, clusterPowerHist.Len()),
+ "Sec Avg": fmt.Sprintf("%f", clusterMean)},
+ "")
if clusterMean > hiThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Need to cap a node")
+ log.InfoLevel,
+ log.Fields{}, "Need to cap a node")
// Create statics for all victims and choose one to cap
victims := make([]pcp.Victim, 0, 8)
@@ -164,13 +164,13 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
cappedHosts[victim.Host] = true
orderCapped = append(orderCapped, victim.Host)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Capping Victim" : fmt.Sprintf("%s",victim.Host),
- "Avg. Wattage" : fmt.Sprintf("%f", victim.Watts*pcp.RAPLUnits)}, "")
+ log.InfoLevel,
+ log.Fields{"Capping Victim": fmt.Sprintf("%s", victim.Host),
+ "Avg. Wattage": fmt.Sprintf("%f", victim.Watts*pcp.RAPLUnits)}, "")
if err := rapl.Cap(victim.Host, "rapl", 50); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR,
- log.ErrorLevel,
- log.Fields {}, "Error capping host")
+ log.ErrorLevel,
+ log.Fields{}, "Error capping host")
}
break // Only cap one machine at at time.
}
@@ -185,12 +185,12 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
// User RAPL package to send uncap.
log.Printf("Uncapping host %s", host)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Uncapped host" : host}, "")
+ log.InfoLevel,
+ log.Fields{"Uncapped host": host}, "")
if err := rapl.Cap(host, "rapl", 100); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR,
- log.ErrorLevel,
- log.Fields {}, "Error capping host")
+ log.ErrorLevel,
+ log.Fields{}, "Error capping host")
}
}
}
@@ -201,8 +201,8 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
}(logging, hiThreshold, loThreshold)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "PCP logging started")
+ log.InfoLevel,
+ log.Fields{}, "PCP logging started")
if err := cmd.Start(); err != nil {
log.Fatal(err)
@@ -213,8 +213,8 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
select {
case <-quit:
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Stopping PCP logging in 5 seconds")
+ log.InfoLevel,
+ log.Fields{}, "Stopping PCP logging in 5 seconds")
time.Sleep(5 * time.Second)
// http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly
diff --git a/powerCap/progressiveExtrema.go b/powerCap/progressiveExtrema.go
index b7502ad..807449a 100644
--- a/powerCap/progressiveExtrema.go
+++ b/powerCap/progressiveExtrema.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package powerCap
@@ -30,13 +30,13 @@ import (
"syscall"
"time"
+ log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/constants"
+ "github.com/spdfg/elektron/elektronLogging"
+ elekLogT "github.com/spdfg/elektron/elektronLogging/types"
"github.com/spdfg/elektron/pcp"
"github.com/spdfg/elektron/rapl"
"github.com/spdfg/elektron/utilities"
- "github.com/spdfg/elektron/elektronLogging"
- elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
)
func round(num float64) int {
@@ -49,7 +49,7 @@ func getNextCapValue(curCapValue float64, precision int) float64 {
return float64(round(curCapValue*output)) / output
}
-func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiThreshold, loThreshold float64,pcpConfigFile string) {
+func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiThreshold, loThreshold float64, pcpConfigFile string) {
var pcpCommand string = "pmdumptext -m -l -f '' -t 1.0 -d , -c " + pcpConfigFile
cmd := exec.Command("sh", "-c", pcpCommand, pcpConfigFile)
@@ -57,8 +57,8 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
if hiThreshold < loThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "High threshold is lower than low threshold!")
+ log.InfoLevel,
+ log.Fields{}, "High threshold is lower than low threshold!")
}
pipe, err := cmd.StdoutPipe()
@@ -75,8 +75,8 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
// Write to logfile
elektronLogging.ElektronLog.Log(elekLogT.PCP,
- log.InfoLevel,
- log.Fields {}, scanner.Text())
+ log.InfoLevel,
+ log.Fields{}, scanner.Text())
headers := strings.Split(scanner.Text(), ",")
@@ -116,14 +116,14 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
for scanner.Scan() {
if *logging {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Logging PCP...")
+ log.InfoLevel,
+ log.Fields{}, "Logging PCP...")
split := strings.Split(scanner.Text(), ",")
text := scanner.Text()
elektronLogging.ElektronLog.Log(elekLogT.PCP,
- log.InfoLevel,
- log.Fields {}, text)
+ log.InfoLevel,
+ log.Fields{}, text)
totalPower := 0.0
for _, powerIndex := range powerIndexes {
@@ -135,9 +135,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
powerHistories[host] = powerHistories[host].Next()
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Host" : fmt.Sprintf("%s",indexToHost[powerIndex]), "Power" : fmt.Sprintf("%f",(power * pcp.RAPLUnits))},
- "")
+ log.InfoLevel,
+ log.Fields{"Host": fmt.Sprintf("%s", indexToHost[powerIndex]), "Power": fmt.Sprintf("%f", (power * pcp.RAPLUnits))},
+ "")
totalPower += power
}
clusterPower := totalPower * pcp.RAPLUnits
@@ -148,23 +148,23 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
clusterMean := pcp.AverageClusterPowerHistory(clusterPowerHist)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Total power" : fmt.Sprintf("%f %d",clusterPower,clusterPowerHist.Len()),
- "Sec Avg" : fmt.Sprintf("%f",clusterMean)},
- "")
+ log.InfoLevel,
+ log.Fields{"Total power": fmt.Sprintf("%f %d", clusterPower, clusterPowerHist.Len()),
+ "Sec Avg": fmt.Sprintf("%f", clusterMean)},
+ "")
if clusterMean >= hiThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Need to cap a node")
-
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Cap values of capped victims" : fmt.Sprintf("%v",cappedVictims)}, "")
-
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Cap values of victims to uncap" : fmt.Sprintf("%v",orderCappedVictims)}, "")
+ log.InfoLevel,
+ log.Fields{}, "Need to cap a node")
+
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{"Cap values of capped victims": fmt.Sprintf("%v", cappedVictims)}, "")
+
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{"Cap values of victims to uncap": fmt.Sprintf("%v", orderCappedVictims)}, "")
// Create statics for all victims and choose one to cap
victims := make([]pcp.Victim, 0, 8)
@@ -191,15 +191,15 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
}
// Need to cap this victim.
if err := rapl.Cap(victims[i].Host, "rapl", 50.0); err != nil {
-
- elektronLogging.ElektronLog.Log(elekLogT.ERROR,
- log.ErrorLevel,
- log.Fields {"Error capping host" : fmt.Sprintf("%s",victims[i].Host)}, "")
+
+ elektronLogging.ElektronLog.Log(elekLogT.ERROR,
+ log.ErrorLevel,
+ log.Fields{"Error capping host": fmt.Sprintf("%s", victims[i].Host)}, "")
} else {
-
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, fmt.Sprintf("Capped host[%s] at %f", victims[i].Host, 50.0))
+
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, fmt.Sprintf("Capped host[%s] at %f", victims[i].Host, 50.0))
// Keeping track of this victim and it's cap value
cappedVictims[victims[i].Host] = 50.0
newVictimFound = true
@@ -222,15 +222,15 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
if capValue > constants.LowerCapLimit {
newCapValue := getNextCapValue(capValue, 2)
if err := rapl.Cap(alreadyCappedHosts[i], "rapl", newCapValue); err != nil {
-
- elektronLogging.ElektronLog.Log(elekLogT.ERROR,
- log.ErrorLevel,
- log.Fields {"Error capping host" : fmt.Sprintf("%s",alreadyCappedHosts[i])}, "")
+
+ elektronLogging.ElektronLog.Log(elekLogT.ERROR,
+ log.ErrorLevel,
+ log.Fields{"Error capping host": fmt.Sprintf("%s", alreadyCappedHosts[i])}, "")
} else {
// Successful cap
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, fmt.Sprintf("Capped host[%s] at %f", alreadyCappedHosts[i], newCapValue))
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, fmt.Sprintf("Capped host[%s] at %f", alreadyCappedHosts[i], newCapValue))
// Checking whether this victim can be capped further
if newCapValue <= constants.LowerCapLimit {
// Deleting victim from cappedVictims.
@@ -253,23 +253,23 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
}
}
if !canCapAlreadyCappedVictim {
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "No Victim left to cap")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, "No Victim left to cap")
}
}
} else if clusterMean < loThreshold {
-
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Need to uncap a node")
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Cap values of capped victims" : fmt.Sprintf("%v",cappedVictims)}, "")
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Cap values of victims to uncap" : fmt.Sprintf("%v",orderCappedVictims)}, "")
+
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, "Need to uncap a node")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{"Cap values of capped victims": fmt.Sprintf("%v", cappedVictims)}, "")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{"Cap values of victims to uncap": fmt.Sprintf("%v", orderCappedVictims)}, "")
if len(orderCapped) > 0 {
// We pick the host that is capped the most to uncap.
orderCappedToSort := utilities.GetPairList(orderCappedVictims)
@@ -279,15 +279,15 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
// This is a floating point operation and might suffer from precision loss.
newUncapValue := orderCappedVictims[hostToUncap] * 2.0
if err := rapl.Cap(hostToUncap, "rapl", newUncapValue); err != nil {
-
- elektronLogging.ElektronLog.Log(elekLogT.ERROR,
- log.ErrorLevel,
- log.Fields {"Error uncapping host" : fmt.Sprintf("%s",hostToUncap)}, "")
+
+ elektronLogging.ElektronLog.Log(elekLogT.ERROR,
+ log.ErrorLevel,
+ log.Fields{"Error uncapping host": fmt.Sprintf("%s", hostToUncap)}, "")
} else {
// Successful uncap
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, fmt.Sprintf("Uncapped host[%s] to %f", hostToUncap, newUncapValue))
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, fmt.Sprintf("Uncapped host[%s] to %f", hostToUncap, newUncapValue))
// Can we uncap this host further. If not, then we remove its entry from orderCapped
if newUncapValue >= 100.0 { // can compare using ==
// Deleting entry from orderCapped
@@ -308,9 +308,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
}
}
} else {
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "No host staged for Uncapped")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, "No host staged for Uncapped")
}
}
}
@@ -319,9 +319,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
}(logging, hiThreshold, loThreshold)
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "PCP logging started")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, "PCP logging started")
if err := cmd.Start(); err != nil {
log.Fatal(err)
}
@@ -330,9 +330,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
select {
case <-quit:
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {}, "Stopping PCP logging in 5 seconds")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
+ log.InfoLevel,
+ log.Fields{}, "Stopping PCP logging in 5 seconds")
time.Sleep(5 * time.Second)
// http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly
diff --git a/rapl/cap.go b/rapl/cap.go
index 2445045..42f94f6 100644
--- a/rapl/cap.go
+++ b/rapl/cap.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package rapl
diff --git a/scheduler.go b/scheduler.go
index 55b420e..63cd2f1 100644
--- a/scheduler.go
+++ b/scheduler.go
@@ -28,13 +28,13 @@ import (
"github.com/golang/protobuf/proto"
mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
sched "github.com/mesos/mesos-go/api/v0/scheduler"
+ log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def"
+ "github.com/spdfg/elektron/elektronLogging"
+ elekLogT "github.com/spdfg/elektron/elektronLogging/types"
"github.com/spdfg/elektron/pcp"
"github.com/spdfg/elektron/powerCap"
"github.com/spdfg/elektron/schedulers"
- "github.com/spdfg/elektron/elektronLogging"
- elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
)
var master = flag.String("master", "", "Location of leading Mesos master -- :")
@@ -283,10 +283,10 @@ func main() {
// Starting the scheduler driver.
if status, err := driver.Run(); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR,
- log.ErrorLevel,
- log.Fields {"status" : status.String(), "error" : err.Error()}, "Framework stopped ")
+ log.ErrorLevel,
+ log.Fields{"status": status.String(), "error": err.Error()}, "Framework stopped ")
}
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel,
- log.Fields {}, "Exiting...")
+ log.Fields{}, "Exiting...")
}
diff --git a/schedulers/MaxGreedyMins.go b/schedulers/MaxGreedyMins.go
index c555409..b4b250d 100644
--- a/schedulers/MaxGreedyMins.go
+++ b/schedulers/MaxGreedyMins.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
diff --git a/schedulers/MaxMin.go b/schedulers/MaxMin.go
index ef8fb88..a7ba29e 100644
--- a/schedulers/MaxMin.go
+++ b/schedulers/MaxMin.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
diff --git a/schedulers/base.go b/schedulers/base.go
index ba8a9a2..677ed81 100644
--- a/schedulers/base.go
+++ b/schedulers/base.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
@@ -28,12 +28,12 @@ import (
mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
"github.com/mesos/mesos-go/api/v0/mesosutil"
sched "github.com/mesos/mesos-go/api/v0/scheduler"
+ log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def"
+ "github.com/spdfg/elektron/elektronLogging"
+ elekLogT "github.com/spdfg/elektron/elektronLogging/types"
"github.com/spdfg/elektron/utilities"
"github.com/spdfg/elektron/utilities/schedUtils"
- "github.com/spdfg/elektron/elektronLogging"
- elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
)
type BaseScheduler struct {
@@ -251,14 +251,14 @@ func (s *BaseScheduler) StatusUpdate(driver sched.SchedulerDriver, status *mesos
func (s *BaseScheduler) LogTaskStarting(ts *def.Task, offer *mesos.Offer) {
lmt := elekLogT.GENERAL
if ts == nil {
- elektronLogging.ElektronLog.Log(lmt, log.InfoLevel,
- log.Fields {"host" : fmt.Sprintf("%s",offer.GetHostname())}, "TASKS STARTING...")
+ elektronLogging.ElektronLog.Log(lmt, log.InfoLevel,
+ log.Fields{"host": fmt.Sprintf("%s", offer.GetHostname())}, "TASKS STARTING...")
} else {
elektronLogging.ElektronLog.Log(lmt,
- log.InfoLevel,
- log.Fields {"task" : fmt.Sprintf("%s",ts.Name),
- "Instance" : fmt.Sprintf("%d",*ts.Instances), "host" : fmt.Sprintf("%s",offer.GetHostname())},
- "TASK STARTING... ")
+ log.InfoLevel,
+ log.Fields{"task": fmt.Sprintf("%s", ts.Name),
+ "Instance": fmt.Sprintf("%d", *ts.Instances), "host": fmt.Sprintf("%s", offer.GetHostname())},
+ "TASK STARTING... ")
}
}
@@ -266,28 +266,28 @@ func (s *BaseScheduler) LogTaskWattsConsideration(ts def.Task, host string, watt
lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"task" : ts.Name, "host" : host, "Watts" : fmt.Sprintf("%f",wattsToConsider)}, "Watts considered for ")
+ log.Fields{"task": ts.Name, "host": host, "Watts": fmt.Sprintf("%f", wattsToConsider)}, "Watts considered for ")
}
func (s *BaseScheduler) LogOffersReceived(offers []*mesos.Offer) {
lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"Resource offers received" : fmt.Sprintf("%d",len(offers))}, "")
+ log.Fields{"Resource offers received": fmt.Sprintf("%d", len(offers))}, "")
}
func (s *BaseScheduler) LogNoPendingTasksDeclineOffers(offer *mesos.Offer) {
lmt := elekLogT.WARNING
elektronLogging.ElektronLog.Log(lmt,
log.WarnLevel,
- log.Fields {"DECLINING OFFER for host" : fmt.Sprintf("%s",offer.GetHostname())}, "No tasks left to schedule ")
+ log.Fields{"DECLINING OFFER for host": fmt.Sprintf("%s", offer.GetHostname())}, "No tasks left to schedule ")
}
func (s *BaseScheduler) LogNumberOfRunningTasks() {
lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"Number of tasks still Running" : fmt.Sprintf("%d",s.tasksRunning)}, "")
+ log.Fields{"Number of tasks still Running": fmt.Sprintf("%d", s.tasksRunning)}, "")
}
func (s *BaseScheduler) LogCoLocatedTasks(slaveID string) {
@@ -300,20 +300,20 @@ func (s *BaseScheduler) LogCoLocatedTasks(slaveID string) {
s.TasksRunningMutex.Unlock()
elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"Colocated with" : fmt.Sprintf("%s",buffer.String())}, "")
+ log.Fields{"Colocated with": fmt.Sprintf("%s", buffer.String())}, "")
}
func (s *BaseScheduler) LogSchedTrace(taskToSchedule *mesos.TaskInfo, offer *mesos.Offer) {
elektronLogging.ElektronLog.Log(elekLogT.SCHED_TRACE,
log.InfoLevel,
- log.Fields {offer.GetHostname() : fmt.Sprintf("%s",taskToSchedule.GetTaskId().GetValue())}, "")
+ log.Fields{offer.GetHostname(): fmt.Sprintf("%s", taskToSchedule.GetTaskId().GetValue())}, "")
}
func (s *BaseScheduler) LogTerminateScheduler() {
lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {}, "Done scheduling all tasks!")
+ log.Fields{}, "Done scheduling all tasks!")
}
func (s *BaseScheduler) LogInsufficientResourcesDeclineOffer(offer *mesos.Offer,
@@ -323,72 +323,72 @@ func (s *BaseScheduler) LogInsufficientResourcesDeclineOffer(offer *mesos.Offer,
buffer.WriteString(fmt.Sprintf("", offerResources...))
elektronLogging.ElektronLog.Log(lmt,
log.WarnLevel,
- log.Fields {"Offer Resources" : fmt.Sprintf("%s",buffer.String())}, "DECLINING OFFER... Offer has insufficient resources to launch a task")
+ log.Fields{"Offer Resources": fmt.Sprintf("%s", buffer.String())}, "DECLINING OFFER... Offer has insufficient resources to launch a task")
}
func (s *BaseScheduler) LogOfferRescinded(offerID *mesos.OfferID) {
lmt := elekLogT.ERROR
elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel,
- log.Fields {"OfferID" : fmt.Sprintf("%s",offerID)}, "OFFER RESCINDED")
+ log.Fields{"OfferID": fmt.Sprintf("%s", offerID)}, "OFFER RESCINDED")
}
func (s *BaseScheduler) LogSlaveLost(slaveID *mesos.SlaveID) {
lmt := elekLogT.ERROR
elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel,
- log.Fields {"SlaveID" : fmt.Sprintf("%s",slaveID)}, "SLAVE LOST")
+ log.Fields{"SlaveID": fmt.Sprintf("%s", slaveID)}, "SLAVE LOST")
}
func (s *BaseScheduler) LogExecutorLost(executorID *mesos.ExecutorID, slaveID *mesos.SlaveID) {
lmt := elekLogT.ERROR
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel,
- log.Fields {"ExecutorID" : fmt.Sprintf("%s",executorID), "SlaveID" : fmt.Sprintf("%s", slaveID)}, "EXECUTOR LOST")
+ log.Fields{"ExecutorID": fmt.Sprintf("%s", executorID), "SlaveID": fmt.Sprintf("%s", slaveID)}, "EXECUTOR LOST")
}
func (s *BaseScheduler) LogFrameworkMessage(executorID *mesos.ExecutorID,
slaveID *mesos.SlaveID, message string) {
lmt := elekLogT.GENERAL
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"Received Framework message from executor" : executorID}, message)
+ log.Fields{"Received Framework message from executor": executorID}, message)
}
func (s *BaseScheduler) LogMesosError(err string) {
lmt := elekLogT.ERROR
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel,
- log.Fields {"MESOS ERROR" : fmt.Sprintf("%v", err)}, "")
+ log.Fields{"MESOS ERROR": fmt.Sprintf("%v", err)}, "")
}
func (s *BaseScheduler) LogElectronError(err error) {
lmt := elekLogT.ERROR
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel,
- log.Fields {"ELECTRON ERROR" : fmt.Sprintf("%v",err)}, "")
+ log.Fields{"ELECTRON ERROR": fmt.Sprintf("%v", err)}, "")
}
func (s *BaseScheduler) LogFrameworkRegistered(frameworkID *mesos.FrameworkID,
masterInfo *mesos.MasterInfo) {
lmt := elekLogT.SUCCESS
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"frameworkID" : fmt.Sprintf("%s",frameworkID), "master" : fmt.Sprintf("%s",masterInfo)}, "FRAMEWORK REGISTERED!")
+ log.Fields{"frameworkID": fmt.Sprintf("%s", frameworkID), "master": fmt.Sprintf("%s", masterInfo)}, "FRAMEWORK REGISTERED!")
}
func (s *BaseScheduler) LogFrameworkReregistered(masterInfo *mesos.MasterInfo) {
lmt := elekLogT.GENERAL
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"master" : fmt.Sprintf("%s",masterInfo)}, "Framework re-registered")
+ log.Fields{"master": fmt.Sprintf("%s", masterInfo)}, "Framework re-registered")
}
func (s *BaseScheduler) LogDisconnected() {
lmt := elekLogT.WARNING
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.WarnLevel,
- log.Fields {}, "Framework disconnected with master")
+ log.Fields{}, "Framework disconnected with master")
}
func (s *BaseScheduler) LogTaskStatusUpdate(status *mesos.TaskStatus) {
@@ -402,16 +402,16 @@ func (s *BaseScheduler) LogTaskStatusUpdate(status *mesos.TaskStatus) {
default:
lmt = elekLogT.GENERAL
}
- elektronLogging.ElektronLog.Log(lmt,
+ elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel,
- log.Fields {"task" : fmt.Sprintf("%s",*status.TaskId.Value), "state" : NameFor(status.State)}, "Task Status received")
+ log.Fields{"task": fmt.Sprintf("%s", *status.TaskId.Value), "state": NameFor(status.State)}, "Task Status received")
}
func (s *BaseScheduler) LogSchedPolicySwitch(name string, nextPolicy SchedPolicyState) {
logSPS := func() {
- elektronLogging.ElektronLog.Log(elekLogT.SPS,
- log.InfoLevel,
- log.Fields {"Name" : name}, "")
+ elektronLogging.ElektronLog.Log(elekLogT.SPS,
+ log.InfoLevel,
+ log.Fields{"Name": name}, "")
}
if s.hasReceivedResourceOffers && (s.curSchedPolicy != nextPolicy) {
logSPS()
@@ -420,14 +420,14 @@ func (s *BaseScheduler) LogSchedPolicySwitch(name string, nextPolicy SchedPolicy
}
// Logging the size of the scheduling window and the scheduling policy
// that is going to schedule the tasks in the scheduling window.
- elektronLogging.ElektronLog.Log(elekLogT.SCHED_WINDOW,
+ elektronLogging.ElektronLog.Log(elekLogT.SCHED_WINDOW,
log.InfoLevel,
- log.Fields {"Window size" : fmt.Sprintf("%d",s.schedWindowSize), "Name" : name}, "")
+ log.Fields{"Window size": fmt.Sprintf("%d", s.schedWindowSize), "Name": name}, "")
}
func (s *BaseScheduler) LogClsfnAndTaskDistOverhead(overhead time.Duration) {
// Logging the overhead in microseconds.
elektronLogging.ElektronLog.Log(elekLogT.CLSFN_TASKDIST_OVERHEAD,
log.InfoLevel,
- log.Fields {"Overhead in microseconds" : fmt.Sprintf("%f", float64(overhead.Nanoseconds())/1000.0)}, "")
+ log.Fields{"Overhead in microseconds": fmt.Sprintf("%f", float64(overhead.Nanoseconds())/1000.0)}, "")
}
diff --git a/schedulers/bin-packing.go b/schedulers/bin-packing.go
index 894bcba..aba4fbb 100644
--- a/schedulers/bin-packing.go
+++ b/schedulers/bin-packing.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
diff --git a/schedulers/electronScheduler.go b/schedulers/electronScheduler.go
index 6b7969f..21bb14a 100644
--- a/schedulers/electronScheduler.go
+++ b/schedulers/electronScheduler.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
diff --git a/schedulers/first-fit.go b/schedulers/first-fit.go
index 121fc0f..2e1a9c3 100644
--- a/schedulers/first-fit.go
+++ b/schedulers/first-fit.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
diff --git a/schedulers/helpers.go b/schedulers/helpers.go
index 439e740..59ada5d 100644
--- a/schedulers/helpers.go
+++ b/schedulers/helpers.go
@@ -23,26 +23,26 @@ import (
mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
sched "github.com/mesos/mesos-go/api/v0/scheduler"
"github.com/pkg/errors"
+ log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/constants"
"github.com/spdfg/elektron/def"
+ "github.com/spdfg/elektron/elektronLogging"
+ elekLogT "github.com/spdfg/elektron/elektronLogging/types"
"github.com/spdfg/elektron/utilities"
"github.com/spdfg/elektron/utilities/mesosUtils"
- log "github.com/sirupsen/logrus"
- "github.com/spdfg/elektron/elektronLogging"
- elekLogT "github.com/spdfg/elektron/elektronLogging/types"
)
func coLocated(tasks map[string]bool, s BaseScheduler) {
for task := range tasks {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
- log.InfoLevel,
- log.Fields {"Task" : task}, "")
+ log.InfoLevel,
+ log.Fields{"Task": task}, "")
}
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel,
- log.Fields {}, "---------------------")
+ log.Fields{}, "---------------------")
}
// Get the powerClass of the given hostname.
diff --git a/schedulers/schedPolicy.go b/schedulers/schedPolicy.go
index 1ae1b72..36521b3 100644
--- a/schedulers/schedPolicy.go
+++ b/schedulers/schedPolicy.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
@@ -24,10 +24,10 @@ import (
mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
sched "github.com/mesos/mesos-go/api/v0/scheduler"
+ log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def"
"github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
)
type SchedPolicyContext interface {
@@ -92,7 +92,7 @@ func switchTaskDistBased(baseSchedRef *BaseScheduler) string {
baseSchedRef.LogClsfnAndTaskDistOverhead(time.Now().Sub(startTime))
elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel,
- log.Fields {"Task Distribution" : fmt.Sprintf("%f",taskDist)}, "Switching... ")
+ log.Fields{"Task Distribution": fmt.Sprintf("%f", taskDist)}, "Switching... ")
if err != nil {
// All the tasks in the window were only classified into 1 cluster.
// Max-Min and Max-GreedyMins would work the same way as Bin-Packing for this situation.
diff --git a/schedulers/states.go b/schedulers/states.go
index 30b41b2..d0bcfb7 100644
--- a/schedulers/states.go
+++ b/schedulers/states.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
diff --git a/schedulers/store.go b/schedulers/store.go
index f2ef41f..f2191db 100644
--- a/schedulers/store.go
+++ b/schedulers/store.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedulers
diff --git a/utilities/mesosUtils/mesosUtils.go b/utilities/mesosUtils/mesosUtils.go
index 2778592..92fc046 100644
--- a/utilities/mesosUtils/mesosUtils.go
+++ b/utilities/mesosUtils/mesosUtils.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package mesosUtils
diff --git a/utilities/offerUtils/offerUtils.go b/utilities/offerUtils/offerUtils.go
index 7f05411..06a594c 100644
--- a/utilities/offerUtils/offerUtils.go
+++ b/utilities/offerUtils/offerUtils.go
@@ -1,31 +1,31 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package offerUtils
import (
- "strings"
- "fmt"
+ "fmt"
mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
+ log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/constants"
- "github.com/spdfg/elektron/elektronLogging"
+ "github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
+ "strings"
)
func OfferAgg(offer *mesos.Offer) (float64, float64, float64) {
@@ -90,14 +90,14 @@ func UpdateEnvironment(offer *mesos.Offer) {
var host = offer.GetHostname()
// If this host is not present in the set of hosts.
if _, ok := constants.Hosts[host]; !ok {
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
- log.Fields {"Adding host" : fmt.Sprintf("%s",host)}, "New host detected")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
+ log.Fields{"Adding host": fmt.Sprintf("%s", host)}, "New host detected")
// Add this host.
constants.Hosts[host] = struct{}{}
// Get the power class of this host.
class := PowerClass(offer)
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
- log.Fields {"host" : fmt.Sprintf("%s",host), "PowerClass" : fmt.Sprintf("%s", class)}, "Registering the power class...")
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
+ log.Fields{"host": fmt.Sprintf("%s", host), "PowerClass": fmt.Sprintf("%s", class)}, "Registering the power class...")
// If new power class, register the power class.
if _, ok := constants.PowerClasses[class]; !ok {
constants.PowerClasses[class] = make(map[string]struct{})
diff --git a/utilities/runAvg/runAvg.go b/utilities/runAvg/runAvg.go
index 5fb2389..557564c 100644
--- a/utilities/runAvg/runAvg.go
+++ b/utilities/runAvg/runAvg.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
/*
A utility to calculate the running average.
diff --git a/utilities/schedUtils/schedUtils.go b/utilities/schedUtils/schedUtils.go
index 31eff56..f90e9de 100644
--- a/utilities/schedUtils/schedUtils.go
+++ b/utilities/schedUtils/schedUtils.go
@@ -1,30 +1,30 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package schedUtils
import (
- "fmt"
+ "fmt"
+ log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def"
- "github.com/spdfg/elektron/utilities"
- "github.com/spdfg/elektron/elektronLogging"
+ "github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types"
- log "github.com/sirupsen/logrus"
+ "github.com/spdfg/elektron/utilities"
)
// Criteria for resizing the scheduling window.
@@ -79,9 +79,9 @@ func (s *fillNextOfferCycle) apply(taskQueue []def.Task) (int, int) {
for _, task := range taskQueue {
numberOfTasksTraversed++
for i := *task.Instances; i > 0; i-- {
- elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
- log.Fields {}, fmt.Sprintf("Checking if Instance #%d of Task[%s] can be scheduled "+
- "during the next offer cycle...", i, task.Name))
+ elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
+ log.Fields{}, fmt.Sprintf("Checking if Instance #%d of Task[%s] can be scheduled "+
+ "during the next offer cycle...", i, task.Name))
if canSchedule(task) {
filledCPU += task.CPU
filledRAM += task.RAM
diff --git a/utilities/trackResourceUsage.go b/utilities/trackResourceUsage.go
index 2279adf..601ee85 100644
--- a/utilities/trackResourceUsage.go
+++ b/utilities/trackResourceUsage.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package utilities
diff --git a/utilities/utils.go b/utilities/utils.go
index 2e1af2e..a93a8a7 100644
--- a/utilities/utils.go
+++ b/utilities/utils.go
@@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg
-//
+//
// This file is part of Elektron.
-//
+//
// Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Elektron. If not, see .
-//
+//
package utilities