spdf/elektron
Archived
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

Code formatting

Browse source
This commit is contained in:
balandi1 2019-11-20 13:33:46 -05:00
parent ef8bd6ac1f
commit 4d15e59d4c
41 changed files with 472 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

10
constants/constants.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// any later version. // any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
// TODO: Clean this up and use Mesos Attributes instead. // TODO: Clean this up and use Mesos Attributes instead.
package constants package constants

10
def/metric.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package def package def

10
def/sortingCriteria.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package def package def

10
def/task.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package def package def

22
def/taskUtils.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package def package def
@ -25,9 +25,9 @@ import (
"github.com/mash/gokmeans" "github.com/mash/gokmeans"
"github.com/montanaflynn/stats" "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" elekLogT "github.com/spdfg/elektron/elektronLogging/types"
log "github.com/sirupsen/logrus"
) )
// Information about a cluster of tasks. // Information about a cluster of tasks.
@ -52,8 +52,8 @@ func (tc TasksToClassify) taskObservationCalculator(task Task) []float64 {
} else if task.Watts != 0.0 { } else if task.Watts != 0.0 {
return []float64{task.Watts} return []float64{task.Watts}
} else { } else {
elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.FatalLevel, elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.FatalLevel,
log.Fields {}, "Unable to classify tasks. Missing Watts or ClassToWatts attribute in workload") log.Fields{}, "Unable to classify tasks. Missing Watts or ClassToWatts attribute in workload")
return []float64{0.0} // Won't reach here. return []float64{0.0} // Won't reach here.
} }
} }
@ -108,8 +108,8 @@ func clusterSizeAvgMMMPU(tasks []Task, taskObservation func(task Task) []float64
} else { } else {
// skip this value // skip this value
// there is an error in the task config. // there is an error in the task config.
elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.ErrorLevel, elektronLogging.ElektronLog.Log(elekLogT.ERROR, log.ErrorLevel,
log.Fields {}, fmt.Sprintf("%s",err)) log.Fields{}, fmt.Sprintf("%s", err))
} }
} else { } else {
// There is only one observation for the task. // There is only one observation for the task.

47
elektronLogging/ElektronFormatter.go
View file

@ -3,9 +3,9 @@ package elektronLogging
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/fatih/color"
log "github.com/sirupsen/logrus"
"strings" "strings"
"github.com/fatih/color"
log "github.com/sirupsen/logrus"
) )
type ElektronFormatter struct { type ElektronFormatter struct {
@ -13,18 +13,18 @@ type ElektronFormatter struct {
} }
func (f ElektronFormatter) getColor(entry *log.Entry) *color.Color { func (f ElektronFormatter) getColor(entry *log.Entry) *color.Color {
switch entry.Level { switch entry.Level {
case log.InfoLevel: case log.InfoLevel:
return color.New(color.FgGreen, color.Bold) return color.New(color.FgGreen, color.Bold)
case log.WarnLevel: case log.WarnLevel:
return color.New(color.FgYellow, color.Bold) return color.New(color.FgYellow, color.Bold)
case log.ErrorLevel: case log.ErrorLevel:
return color.New(color.FgRed, color.Bold) return color.New(color.FgRed, color.Bold)
case log.FatalLevel: case log.FatalLevel:
return color.New(color.FgRed, color.Bold) return color.New(color.FgRed, color.Bold)
default: default:
return color.New(color.FgWhite, color.Bold) return color.New(color.FgWhite, color.Bold)
} }
} }
func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) { func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) {
var b *bytes.Buffer var b *bytes.Buffer
@ -35,19 +35,18 @@ func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) {
b = &bytes.Buffer{} b = &bytes.Buffer{}
} }
levelColor := f.getColor(entry) levelColor := f.getColor(entry)
level := levelColor.Sprintf("[%s]:",strings.ToUpper(entry.Level.String())) level := levelColor.Sprintf("[%s]:", strings.ToUpper(entry.Level.String()))
message := fmt.Sprintf("%s %s ",level,entry.Time.Format(f.TimestampFormat)) message := fmt.Sprintf("%s %s ", level, entry.Time.Format(f.TimestampFormat))
if entry.Message != "" { if entry.Message != "" {
message = fmt.Sprintf("%s %s %s ",level,entry.Time.Format(f.TimestampFormat), entry.Message) message = fmt.Sprintf("%s %s %s ", level, entry.Time.Format(f.TimestampFormat), entry.Message)
} }
var formattedFields []string var formattedFields []string
for key, value := range entry.Data { for key, value := range entry.Data {
formattedFields = append(formattedFields, formattedFields = append(formattedFields,
strings.Join([]string{key, fmt.Sprintf("%s", value)}, "=")) strings.Join([]string{key, fmt.Sprintf("%s", value)}, "="))
} }
b.WriteString(message) b.WriteString(message)
b.WriteString(strings.Join(formattedFields, ", ")) b.WriteString(strings.Join(formattedFields, ", "))
b.WriteByte('\n') b.WriteByte('\n')

18
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -1,8 +1,8 @@
package elektronLogging package elektronLogging
import ( import (
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"os"
) )
type ClsfnTaskDistOverheadLogger struct { type ClsfnTaskDistOverheadLogger struct {
@ -16,16 +16,16 @@ func NewClsfnTaskDistOverheadLogger(logType int, prefix string) *ClsfnTaskDistOv
return cLog 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 { if cLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
if cLog.AllowOnConsole { if cLog.AllowOnConsole {
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(cLog.LogFileName) logger.SetOutput(cLog.LogFileName)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
@ -44,6 +44,6 @@ func (cLog *ClsfnTaskDistOverheadLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
cLog.LogFileName = logFile cLog.LogFileName = logFile
cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole
} }
} }

8
elektronLogging/consoleLogger.go
View file

@ -1,8 +1,8 @@
package elektronLogging package elektronLogging
import ( import (
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"os"
) )
type ConsoleLogger struct { type ConsoleLogger struct {
@ -20,10 +20,10 @@ func (cLog *ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
//logFields := cloneFields(logData) //logFields := cloneFields(logData)
logger.SetLevel(level) logger.SetLevel(level)
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
logger.SetOutput(cLog.LogFileName) logger.SetOutput(cLog.LogFileName)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
@ -42,6 +42,6 @@ func (cLog *ConsoleLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
cLog.LogFileName = logFile cLog.LogFileName = logFile
cLog.AllowOnConsole = true cLog.AllowOnConsole = true
} }
} }

2
elektronLogging/createLogDir.go
View file

@ -1,10 +1,10 @@
package elektronLogging package elektronLogging
import ( import (
logrus "github.com/sirupsen/logrus"
"os" "os"
"strconv" "strconv"
"time" "time"
logrus "github.com/sirupsen/logrus"
) )
var logDir string var logDir string

28
elektronLogging/logger.go
View file

@ -1,11 +1,11 @@
package elektronLogging package elektronLogging
import ( import (
"time" "fmt"
"fmt"
"strconv"
. "github.com/spdfg/elektron/elektronLogging/types"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
. "github.com/spdfg/elektron/elektronLogging/types"
"strconv"
"time"
) )
var config LoggerConfig var config LoggerConfig
@ -14,25 +14,25 @@ var formatter ElektronFormatter
func BuildLogger() *LoggerImpl { func BuildLogger() *LoggerImpl {
// read configuration from yaml // read configuration from yaml
config.GetConfig() config.GetConfig()
// create the log directory // create the log directory
startTime := time.Now() startTime := time.Now()
formatter.TimestampFormat = "2006-01-02 15:04:05" formatter.TimestampFormat = "2006-01-02 15:04:05"
GetLogDir(startTime, "_") GetLogDir(startTime, "_")
prefix := fmt.Sprintf("_%d%d%s%s%s%s",startTime.Year(), startTime.Month(),strconv.Itoa(startTime.Day()), 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())) strconv.Itoa(startTime.Hour()), strconv.Itoa(startTime.Minute()), strconv.Itoa(startTime.Second()))
//create a single logrus instance and set its formatter to ElektronFormatter //create a single logrus instance and set its formatter to ElektronFormatter
logger = log.New() logger = log.New()
logger.SetFormatter(&formatter) logger.SetFormatter(&formatter)
// create a chain of loggers // create a chain of loggers
head := new(LoggerImpl) head := new(LoggerImpl)
cLog := NewConsoleLogger(CONSOLE,prefix) cLog := NewConsoleLogger(CONSOLE, prefix)
pLog := NewPcpLogger(PCP,prefix) pLog := NewPcpLogger(PCP, prefix)
schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix) schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix)
spsLog := NewSchedPolicySwitchLogger(SPS, prefix) spsLog := NewSchedPolicySwitchLogger(SPS, prefix)
schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix) schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix)

8
elektronLogging/loggerChain.go
View file

@ -12,10 +12,10 @@ type Logger interface {
SetLogFile(prefix string) SetLogFile(prefix string)
} }
type LoggerImpl struct { type LoggerImpl struct {
Type int Type int
AllowOnConsole bool AllowOnConsole bool
LogFileName *os.File LogFileName *os.File
next Logger next Logger
} }
func (l *LoggerImpl) SetNext(logType Logger) { func (l *LoggerImpl) SetNext(logType Logger) {

82
elektronLogging/loggerConfig.go
View file

@ -1,68 +1,68 @@
package elektronLogging package elektronLogging
import ( import (
"gopkg.in/yaml.v2" log "github.com/sirupsen/logrus"
"io/ioutil" elekEnv "github.com/spdfg/elektron/environment"
log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2"
elekEnv "github.com/spdfg/elektron/environment" "io/ioutil"
) )
type LoggerConfig struct { type LoggerConfig struct {
SchedTraceConfig struct { SchedTraceConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
AllowOnConsole bool `yaml:"allowOnConsole"` AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"schedTrace"` } `yaml:"schedTrace"`
PCPConfig struct { PCPConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
AllowOnConsole bool `yaml:"allowOnConsole"` AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"pcp"` } `yaml:"pcp"`
ConsoleConfig struct { ConsoleConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
MinLogLevel string `yaml:"minLogLevel"` MinLogLevel string `yaml:"minLogLevel"`
} `yaml:"console"` } `yaml:"console"`
SPSConfig struct { SPSConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
AllowOnConsole bool `yaml:"allowOnConsole"` AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"sps"` } `yaml:"sps"`
TaskDistConfig struct { TaskDistConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
AllowOnConsole bool `yaml:"allowOnConsole"` AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"clsfnTaskDistOverhead"` } `yaml:"clsfnTaskDistOverhead"`
SchedWindowConfig struct { SchedWindowConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` EnableColumnHeaders bool `yaml:"enableColumnHeaders"`
AllowOnConsole bool `yaml:"allowOnConsole"` AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"schedWindow"` } `yaml:"schedWindow"`
Format[] string `yaml:"format"` Format []string `yaml:"format"`
} }
func (c *LoggerConfig) GetConfig() *LoggerConfig { func (c *LoggerConfig) GetConfig() *LoggerConfig {
yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml) yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml)
if err != nil { if err != nil {
log.Printf("yamlFile.Get err #%v ", err) log.Printf("yamlFile.Get err #%v ", err)
} }
err = yaml.Unmarshal(yamlFile, c) err = yaml.Unmarshal(yamlFile, c)
if err != nil { if err != nil {
log.Fatalf("Unmarshal: %v", err) log.Fatalf("Unmarshal: %v", err)
} }
return c return c
} }

14
elektronLogging/pcpLogger.go
View file

@ -1,8 +1,8 @@
package elektronLogging package elektronLogging
import ( import (
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"os"
) )
type PcpLogger struct { type PcpLogger struct {
@ -20,11 +20,11 @@ func (pLog *PcpLogger) Log(logType int, level log.Level, logData log.Fields, mes
if pLog.Type == logType { if pLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
if pLog.AllowOnConsole { if pLog.AllowOnConsole {
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(pLog.LogFileName) logger.SetOutput(pLog.LogFileName)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
@ -44,6 +44,6 @@ func (plog *PcpLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
plog.LogFileName = logFile plog.LogFileName = logFile
plog.AllowOnConsole = config.PCPConfig.AllowOnConsole plog.AllowOnConsole = config.PCPConfig.AllowOnConsole
} }
} }

14
elektronLogging/schedPolicySwitchLogger.go
View file

@ -1,8 +1,8 @@
package elektronLogging package elektronLogging
import ( import (
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"os"
) )
type SchedPolicySwitchLogger struct { type SchedPolicySwitchLogger struct {
@ -20,11 +20,11 @@ func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData l
if sLog.Type == logType { if sLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
if sLog.AllowOnConsole { if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(sLog.LogFileName) logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
@ -44,6 +44,6 @@ func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
sLog.LogFileName = logFile sLog.LogFileName = logFile
sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole
} }
} }

16
elektronLogging/schedTraceLogger.go
View file

@ -1,8 +1,8 @@
package elektronLogging package elektronLogging
import ( import (
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"os"
) )
type SchedTraceLogger struct { type SchedTraceLogger struct {
@ -20,12 +20,12 @@ func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fiel
if sLog.Type == logType { if sLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
if sLog.AllowOnConsole { if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(sLog.LogFileName) logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
@ -44,6 +44,6 @@ func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
sLog.LogFileName = logFile sLog.LogFileName = logFile
sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole
} }
} }

12
elektronLogging/schedWindowLogger.go
View file

@ -1,8 +1,8 @@
package elektronLogging package elektronLogging
import ( import (
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"os"
) )
type SchedWindowLogger struct { type SchedWindowLogger struct {
@ -21,10 +21,10 @@ func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fie
logger.SetLevel(level) logger.SetLevel(level)
if sLog.AllowOnConsole { if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(sLog.LogFileName) logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
@ -43,6 +43,6 @@ func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
sLog.LogFileName = logFile sLog.LogFileName = logFile
sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole
} }
} }

22
elektronLogging/types/types.go
View file

@ -1,16 +1,14 @@
package elektronLogging package elektronLogging
const ( const (
ERROR = iota ERROR = iota
WARNING = iota WARNING = iota
GENERAL = iota GENERAL = iota
SUCCESS = iota SUCCESS = iota
CONSOLE = iota CONSOLE = iota
PCP = iota PCP = iota
SCHED_TRACE = iota SCHED_TRACE = iota
SPS = iota SPS = iota
SCHED_WINDOW = iota SCHED_WINDOW = iota
CLSFN_TASKDIST_OVERHEAD = iota CLSFN_TASKDIST_OVERHEAD = iota
) )

10
environment/env.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package environment package environment

38
pcp/pcp.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package pcp package pcp
@ -24,12 +24,12 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/spdfg/elektron/elektronLogging" log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types" 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 var pcpCommand string = "pmdumptext -m -l -f '' -t 1.0 -d , -c " + pcpConfigFile
cmd := exec.Command("sh", "-c", pcpCommand) cmd := exec.Command("sh", "-c", pcpCommand)
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
@ -47,9 +47,9 @@ func Start(quit chan struct{}, logging *bool,pcpConfigFile string) {
scanner.Scan() scanner.Scan()
// Write to logfile // Write to logfile
elektronLogging.ElektronLog.Log(elekLogT.PCP, elektronLogging.ElektronLog.Log(elekLogT.PCP,
log.InfoLevel, log.InfoLevel,
log.Fields {}, scanner.Text()) log.Fields{}, scanner.Text())
// Throw away first set of results // Throw away first set of results
scanner.Scan() scanner.Scan()
@ -60,18 +60,18 @@ func Start(quit chan struct{}, logging *bool,pcpConfigFile string) {
text := scanner.Text() text := scanner.Text()
if *logging { if *logging {
elektronLogging.ElektronLog.Log(elekLogT.PCP, elektronLogging.ElektronLog.Log(elekLogT.PCP,
log.InfoLevel, log.InfoLevel,
log.Fields {}, text) log.Fields{}, text)
} }
seconds++ seconds++
} }
}(logging) }(logging)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "PCP logging started") log.Fields{}, "PCP logging started")
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
log.Fatal(err) log.Fatal(err)
@ -81,9 +81,9 @@ func Start(quit chan struct{}, logging *bool,pcpConfigFile string) {
select { select {
case <-quit: case <-quit:
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Stopping PCP logging in 5 seconds") log.Fields{}, "Stopping PCP logging in 5 seconds")
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
// http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly // http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly

10
pcp/utils.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package pcp package pcp

10
pcp/victim.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package pcp package pcp

90
powerCap/extrema.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package powerCap package powerCap
@ -29,14 +29,14 @@ import (
"syscall" "syscall"
"time" "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/pcp"
"github.com/spdfg/elektron/rapl" "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 var pcpCommand string = "pmdumptext -m -l -f '' -t 1.0 -d , -c " + pcpConfigFile
cmd := exec.Command("sh", "-c", pcpCommand, pcpConfigFile) cmd := exec.Command("sh", "-c", pcpCommand, pcpConfigFile)
@ -44,8 +44,8 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
if hiThreshold < loThreshold { if hiThreshold < loThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "High threshold is lower than low threshold!") log.Fields{}, "High threshold is lower than low threshold!")
} }
pipe, err := cmd.StdoutPipe() pipe, err := cmd.StdoutPipe()
@ -61,9 +61,9 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
scanner.Scan() scanner.Scan()
// Write to logfile // Write to logfile
elektronLogging.ElektronLog.Log(elekLogT.PCP, elektronLogging.ElektronLog.Log(elekLogT.PCP,
log.InfoLevel, log.InfoLevel,
log.Fields {}, scanner.Text()) log.Fields{}, scanner.Text())
headers := strings.Split(scanner.Text(), ",") headers := strings.Split(scanner.Text(), ",")
@ -98,17 +98,17 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
for scanner.Scan() { for scanner.Scan() {
if *logging { if *logging {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Logging PCP...") log.Fields{}, "Logging PCP...")
text := scanner.Text() text := scanner.Text()
split := strings.Split(text, ",") split := strings.Split(text, ",")
elektronLogging.ElektronLog.Log(elekLogT.PCP, elektronLogging.ElektronLog.Log(elekLogT.PCP,
log.InfoLevel, log.InfoLevel,
log.Fields {}, text) log.Fields{}, text)
totalPower := 0.0 totalPower := 0.0
for _, powerIndex := range powerIndexes { for _, powerIndex := range powerIndexes {
@ -119,10 +119,10 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
powerHistories[host].Value = power powerHistories[host].Value = power
powerHistories[host] = powerHistories[host].Next() powerHistories[host] = powerHistories[host].Next()
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Host" : fmt.Sprintf("%s",indexToHost[powerIndex]), "Power" : fmt.Sprintf("%f",(power * pcp.RAPLUnits))}, log.Fields{"Host": fmt.Sprintf("%s", indexToHost[powerIndex]), "Power": fmt.Sprintf("%f", (power * pcp.RAPLUnits))},
"") "")
totalPower += power totalPower += power
} }
@ -134,15 +134,15 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
clusterMean := pcp.AverageClusterPowerHistory(clusterPowerHist) clusterMean := pcp.AverageClusterPowerHistory(clusterPowerHist)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Total power" : fmt.Sprintf("%f %d",clusterPower,clusterPowerHist.Len()), log.Fields{"Total power": fmt.Sprintf("%f %d", clusterPower, clusterPowerHist.Len()),
"Sec Avg" : fmt.Sprintf("%f",clusterMean)}, "Sec Avg": fmt.Sprintf("%f", clusterMean)},
"") "")
if clusterMean > hiThreshold { if clusterMean > hiThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Need to cap a node") log.Fields{}, "Need to cap a node")
// Create statics for all victims and choose one to cap // Create statics for all victims and choose one to cap
victims := make([]pcp.Victim, 0, 8) victims := make([]pcp.Victim, 0, 8)
@ -164,13 +164,13 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
cappedHosts[victim.Host] = true cappedHosts[victim.Host] = true
orderCapped = append(orderCapped, victim.Host) orderCapped = append(orderCapped, victim.Host)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Capping Victim" : fmt.Sprintf("%s",victim.Host), log.Fields{"Capping Victim": fmt.Sprintf("%s", victim.Host),
"Avg. Wattage" : fmt.Sprintf("%f", victim.Watts*pcp.RAPLUnits)}, "") "Avg. Wattage": fmt.Sprintf("%f", victim.Watts*pcp.RAPLUnits)}, "")
if err := rapl.Cap(victim.Host, "rapl", 50); err != nil { if err := rapl.Cap(victim.Host, "rapl", 50); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR, elektronLogging.ElektronLog.Log(elekLogT.ERROR,
log.ErrorLevel, log.ErrorLevel,
log.Fields {}, "Error capping host") log.Fields{}, "Error capping host")
} }
break // Only cap one machine at at time. 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. // User RAPL package to send uncap.
log.Printf("Uncapping host %s", host) log.Printf("Uncapping host %s", host)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Uncapped host" : host}, "") log.Fields{"Uncapped host": host}, "")
if err := rapl.Cap(host, "rapl", 100); err != nil { if err := rapl.Cap(host, "rapl", 100); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR, elektronLogging.ElektronLog.Log(elekLogT.ERROR,
log.ErrorLevel, log.ErrorLevel,
log.Fields {}, "Error capping host") log.Fields{}, "Error capping host")
} }
} }
} }
@ -201,8 +201,8 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
}(logging, hiThreshold, loThreshold) }(logging, hiThreshold, loThreshold)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "PCP logging started") log.Fields{}, "PCP logging started")
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
log.Fatal(err) log.Fatal(err)
@ -213,8 +213,8 @@ func StartPCPLogAndExtremaDynamicCap(quit chan struct{}, logging *bool, hiThresh
select { select {
case <-quit: case <-quit:
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Stopping PCP logging in 5 seconds") log.Fields{}, "Stopping PCP logging in 5 seconds")
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
// http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly // http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly

156
powerCap/progressiveExtrema.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package powerCap package powerCap
@ -30,13 +30,13 @@ import (
"syscall" "syscall"
"time" "time"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/constants" "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/pcp"
"github.com/spdfg/elektron/rapl" "github.com/spdfg/elektron/rapl"
"github.com/spdfg/elektron/utilities" "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 { func round(num float64) int {
@ -49,7 +49,7 @@ func getNextCapValue(curCapValue float64, precision int) float64 {
return float64(round(curCapValue*output)) / output 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 var pcpCommand string = "pmdumptext -m -l -f '' -t 1.0 -d , -c " + pcpConfigFile
cmd := exec.Command("sh", "-c", pcpCommand, pcpConfigFile) cmd := exec.Command("sh", "-c", pcpCommand, pcpConfigFile)
@ -57,8 +57,8 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
if hiThreshold < loThreshold { if hiThreshold < loThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "High threshold is lower than low threshold!") log.Fields{}, "High threshold is lower than low threshold!")
} }
pipe, err := cmd.StdoutPipe() pipe, err := cmd.StdoutPipe()
@ -75,8 +75,8 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
// Write to logfile // Write to logfile
elektronLogging.ElektronLog.Log(elekLogT.PCP, elektronLogging.ElektronLog.Log(elekLogT.PCP,
log.InfoLevel, log.InfoLevel,
log.Fields {}, scanner.Text()) log.Fields{}, scanner.Text())
headers := strings.Split(scanner.Text(), ",") headers := strings.Split(scanner.Text(), ",")
@ -116,14 +116,14 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
for scanner.Scan() { for scanner.Scan() {
if *logging { if *logging {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Logging PCP...") log.Fields{}, "Logging PCP...")
split := strings.Split(scanner.Text(), ",") split := strings.Split(scanner.Text(), ",")
text := scanner.Text() text := scanner.Text()
elektronLogging.ElektronLog.Log(elekLogT.PCP, elektronLogging.ElektronLog.Log(elekLogT.PCP,
log.InfoLevel, log.InfoLevel,
log.Fields {}, text) log.Fields{}, text)
totalPower := 0.0 totalPower := 0.0
for _, powerIndex := range powerIndexes { for _, powerIndex := range powerIndexes {
@ -135,9 +135,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
powerHistories[host] = powerHistories[host].Next() powerHistories[host] = powerHistories[host].Next()
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Host" : fmt.Sprintf("%s",indexToHost[powerIndex]), "Power" : fmt.Sprintf("%f",(power * pcp.RAPLUnits))}, log.Fields{"Host": fmt.Sprintf("%s", indexToHost[powerIndex]), "Power": fmt.Sprintf("%f", (power * pcp.RAPLUnits))},
"") "")
totalPower += power totalPower += power
} }
clusterPower := totalPower * pcp.RAPLUnits clusterPower := totalPower * pcp.RAPLUnits
@ -148,23 +148,23 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
clusterMean := pcp.AverageClusterPowerHistory(clusterPowerHist) clusterMean := pcp.AverageClusterPowerHistory(clusterPowerHist)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Total power" : fmt.Sprintf("%f %d",clusterPower,clusterPowerHist.Len()), log.Fields{"Total power": fmt.Sprintf("%f %d", clusterPower, clusterPowerHist.Len()),
"Sec Avg" : fmt.Sprintf("%f",clusterMean)}, "Sec Avg": fmt.Sprintf("%f", clusterMean)},
"") "")
if clusterMean >= hiThreshold { if clusterMean >= hiThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Need to cap a node") log.Fields{}, "Need to cap a node")
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Cap values of capped victims" : fmt.Sprintf("%v",cappedVictims)}, "") log.Fields{"Cap values of capped victims": fmt.Sprintf("%v", cappedVictims)}, "")
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Cap values of victims to uncap" : fmt.Sprintf("%v",orderCappedVictims)}, "") log.Fields{"Cap values of victims to uncap": fmt.Sprintf("%v", orderCappedVictims)}, "")
// Create statics for all victims and choose one to cap // Create statics for all victims and choose one to cap
victims := make([]pcp.Victim, 0, 8) victims := make([]pcp.Victim, 0, 8)
@ -191,15 +191,15 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
} }
// Need to cap this victim. // Need to cap this victim.
if err := rapl.Cap(victims[i].Host, "rapl", 50.0); err != nil { if err := rapl.Cap(victims[i].Host, "rapl", 50.0); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR, elektronLogging.ElektronLog.Log(elekLogT.ERROR,
log.ErrorLevel, log.ErrorLevel,
log.Fields {"Error capping host" : fmt.Sprintf("%s",victims[i].Host)}, "") log.Fields{"Error capping host": fmt.Sprintf("%s", victims[i].Host)}, "")
} else { } else {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, fmt.Sprintf("Capped host[%s] at %f", victims[i].Host, 50.0)) log.Fields{}, fmt.Sprintf("Capped host[%s] at %f", victims[i].Host, 50.0))
// Keeping track of this victim and it's cap value // Keeping track of this victim and it's cap value
cappedVictims[victims[i].Host] = 50.0 cappedVictims[victims[i].Host] = 50.0
newVictimFound = true newVictimFound = true
@ -222,15 +222,15 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
if capValue > constants.LowerCapLimit { if capValue > constants.LowerCapLimit {
newCapValue := getNextCapValue(capValue, 2) newCapValue := getNextCapValue(capValue, 2)
if err := rapl.Cap(alreadyCappedHosts[i], "rapl", newCapValue); err != nil { if err := rapl.Cap(alreadyCappedHosts[i], "rapl", newCapValue); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR, elektronLogging.ElektronLog.Log(elekLogT.ERROR,
log.ErrorLevel, log.ErrorLevel,
log.Fields {"Error capping host" : fmt.Sprintf("%s",alreadyCappedHosts[i])}, "") log.Fields{"Error capping host": fmt.Sprintf("%s", alreadyCappedHosts[i])}, "")
} else { } else {
// Successful cap // Successful cap
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, fmt.Sprintf("Capped host[%s] at %f", alreadyCappedHosts[i], newCapValue)) log.Fields{}, fmt.Sprintf("Capped host[%s] at %f", alreadyCappedHosts[i], newCapValue))
// Checking whether this victim can be capped further // Checking whether this victim can be capped further
if newCapValue <= constants.LowerCapLimit { if newCapValue <= constants.LowerCapLimit {
// Deleting victim from cappedVictims. // Deleting victim from cappedVictims.
@ -253,23 +253,23 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
} }
} }
if !canCapAlreadyCappedVictim { if !canCapAlreadyCappedVictim {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "No Victim left to cap") log.Fields{}, "No Victim left to cap")
} }
} }
} else if clusterMean < loThreshold { } else if clusterMean < loThreshold {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Need to uncap a node") log.Fields{}, "Need to uncap a node")
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Cap values of capped victims" : fmt.Sprintf("%v",cappedVictims)}, "") log.Fields{"Cap values of capped victims": fmt.Sprintf("%v", cappedVictims)}, "")
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Cap values of victims to uncap" : fmt.Sprintf("%v",orderCappedVictims)}, "") log.Fields{"Cap values of victims to uncap": fmt.Sprintf("%v", orderCappedVictims)}, "")
if len(orderCapped) > 0 { if len(orderCapped) > 0 {
// We pick the host that is capped the most to uncap. // We pick the host that is capped the most to uncap.
orderCappedToSort := utilities.GetPairList(orderCappedVictims) 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. // This is a floating point operation and might suffer from precision loss.
newUncapValue := orderCappedVictims[hostToUncap] * 2.0 newUncapValue := orderCappedVictims[hostToUncap] * 2.0
if err := rapl.Cap(hostToUncap, "rapl", newUncapValue); err != nil { if err := rapl.Cap(hostToUncap, "rapl", newUncapValue); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR, elektronLogging.ElektronLog.Log(elekLogT.ERROR,
log.ErrorLevel, log.ErrorLevel,
log.Fields {"Error uncapping host" : fmt.Sprintf("%s",hostToUncap)}, "") log.Fields{"Error uncapping host": fmt.Sprintf("%s", hostToUncap)}, "")
} else { } else {
// Successful uncap // Successful uncap
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, fmt.Sprintf("Uncapped host[%s] to %f", hostToUncap, newUncapValue)) 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 // Can we uncap this host further. If not, then we remove its entry from orderCapped
if newUncapValue >= 100.0 { // can compare using == if newUncapValue >= 100.0 { // can compare using ==
// Deleting entry from orderCapped // Deleting entry from orderCapped
@ -308,9 +308,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
} }
} }
} else { } else {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "No host staged for Uncapped") log.Fields{}, "No host staged for Uncapped")
} }
} }
} }
@ -319,9 +319,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
}(logging, hiThreshold, loThreshold) }(logging, hiThreshold, loThreshold)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "PCP logging started") log.Fields{}, "PCP logging started")
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -330,9 +330,9 @@ func StartPCPLogAndProgressiveExtremaCap(quit chan struct{}, logging *bool, hiTh
select { select {
case <-quit: case <-quit:
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Stopping PCP logging in 5 seconds") log.Fields{}, "Stopping PCP logging in 5 seconds")
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
// http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly // http://stackoverflow.com/questions/22470193/why-wont-go-kill-a-child-process-correctly

10
rapl/cap.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package rapl package rapl

12
scheduler.go
View file

@ -28,13 +28,13 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
mesos "github.com/mesos/mesos-go/api/v0/mesosproto" mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
sched "github.com/mesos/mesos-go/api/v0/scheduler" sched "github.com/mesos/mesos-go/api/v0/scheduler"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def" "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/pcp"
"github.com/spdfg/elektron/powerCap" "github.com/spdfg/elektron/powerCap"
"github.com/spdfg/elektron/schedulers" "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 -- <mesos-master>:<port>") var master = flag.String("master", "", "Location of leading Mesos master -- <mesos-master>:<port>")
@ -283,10 +283,10 @@ func main() {
// Starting the scheduler driver. // Starting the scheduler driver.
if status, err := driver.Run(); err != nil { if status, err := driver.Run(); err != nil {
elektronLogging.ElektronLog.Log(elekLogT.ERROR, elektronLogging.ElektronLog.Log(elekLogT.ERROR,
log.ErrorLevel, log.ErrorLevel,
log.Fields {"status" : status.String(), "error" : err.Error()}, "Framework stopped ") log.Fields{"status": status.String(), "error": err.Error()}, "Framework stopped ")
} }
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Exiting...") log.Fields{}, "Exiting...")
} }

10
schedulers/MaxGreedyMins.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers

10
schedulers/MaxMin.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers

92
schedulers/base.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers
@ -28,12 +28,12 @@ import (
mesos "github.com/mesos/mesos-go/api/v0/mesosproto" mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
"github.com/mesos/mesos-go/api/v0/mesosutil" "github.com/mesos/mesos-go/api/v0/mesosutil"
sched "github.com/mesos/mesos-go/api/v0/scheduler" sched "github.com/mesos/mesos-go/api/v0/scheduler"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def" "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"
"github.com/spdfg/elektron/utilities/schedUtils" "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 { 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) { func (s *BaseScheduler) LogTaskStarting(ts *def.Task, offer *mesos.Offer) {
lmt := elekLogT.GENERAL lmt := elekLogT.GENERAL
if ts == nil { if ts == nil {
elektronLogging.ElektronLog.Log(lmt, log.InfoLevel, elektronLogging.ElektronLog.Log(lmt, log.InfoLevel,
log.Fields {"host" : fmt.Sprintf("%s",offer.GetHostname())}, "TASKS STARTING...") log.Fields{"host": fmt.Sprintf("%s", offer.GetHostname())}, "TASKS STARTING...")
} else { } else {
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, log.InfoLevel,
log.Fields {"task" : fmt.Sprintf("%s",ts.Name), log.Fields{"task": fmt.Sprintf("%s", ts.Name),
"Instance" : fmt.Sprintf("%d",*ts.Instances), "host" : fmt.Sprintf("%s",offer.GetHostname())}, "Instance": fmt.Sprintf("%d", *ts.Instances), "host": fmt.Sprintf("%s", offer.GetHostname())},
"TASK STARTING... ") "TASK STARTING... ")
} }
} }
@ -266,28 +266,28 @@ func (s *BaseScheduler) LogTaskWattsConsideration(ts def.Task, host string, watt
lmt := elekLogT.GENERAL lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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) { func (s *BaseScheduler) LogOffersReceived(offers []*mesos.Offer) {
lmt := elekLogT.GENERAL lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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) { func (s *BaseScheduler) LogNoPendingTasksDeclineOffers(offer *mesos.Offer) {
lmt := elekLogT.WARNING lmt := elekLogT.WARNING
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.WarnLevel, 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() { func (s *BaseScheduler) LogNumberOfRunningTasks() {
lmt := elekLogT.GENERAL lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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) { func (s *BaseScheduler) LogCoLocatedTasks(slaveID string) {
@ -300,20 +300,20 @@ func (s *BaseScheduler) LogCoLocatedTasks(slaveID string) {
s.TasksRunningMutex.Unlock() s.TasksRunningMutex.Unlock()
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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) { func (s *BaseScheduler) LogSchedTrace(taskToSchedule *mesos.TaskInfo, offer *mesos.Offer) {
elektronLogging.ElektronLog.Log(elekLogT.SCHED_TRACE, elektronLogging.ElektronLog.Log(elekLogT.SCHED_TRACE,
log.InfoLevel, 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() { func (s *BaseScheduler) LogTerminateScheduler() {
lmt := elekLogT.GENERAL lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "Done scheduling all tasks!") log.Fields{}, "Done scheduling all tasks!")
} }
func (s *BaseScheduler) LogInsufficientResourcesDeclineOffer(offer *mesos.Offer, func (s *BaseScheduler) LogInsufficientResourcesDeclineOffer(offer *mesos.Offer,
@ -323,72 +323,72 @@ func (s *BaseScheduler) LogInsufficientResourcesDeclineOffer(offer *mesos.Offer,
buffer.WriteString(fmt.Sprintf("<CPU: %f, RAM: %f, Watts: %f>", offerResources...)) buffer.WriteString(fmt.Sprintf("<CPU: %f, RAM: %f, Watts: %f>", offerResources...))
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.WarnLevel, 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) { func (s *BaseScheduler) LogOfferRescinded(offerID *mesos.OfferID) {
lmt := elekLogT.ERROR lmt := elekLogT.ERROR
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel, 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) { func (s *BaseScheduler) LogSlaveLost(slaveID *mesos.SlaveID) {
lmt := elekLogT.ERROR lmt := elekLogT.ERROR
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel, 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) { func (s *BaseScheduler) LogExecutorLost(executorID *mesos.ExecutorID, slaveID *mesos.SlaveID) {
lmt := elekLogT.ERROR lmt := elekLogT.ERROR
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel, 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, func (s *BaseScheduler) LogFrameworkMessage(executorID *mesos.ExecutorID,
slaveID *mesos.SlaveID, message string) { slaveID *mesos.SlaveID, message string) {
lmt := elekLogT.GENERAL lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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) { func (s *BaseScheduler) LogMesosError(err string) {
lmt := elekLogT.ERROR lmt := elekLogT.ERROR
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel, log.ErrorLevel,
log.Fields {"MESOS ERROR" : fmt.Sprintf("%v", err)}, "") log.Fields{"MESOS ERROR": fmt.Sprintf("%v", err)}, "")
} }
func (s *BaseScheduler) LogElectronError(err error) { func (s *BaseScheduler) LogElectronError(err error) {
lmt := elekLogT.ERROR lmt := elekLogT.ERROR
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.ErrorLevel, 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, func (s *BaseScheduler) LogFrameworkRegistered(frameworkID *mesos.FrameworkID,
masterInfo *mesos.MasterInfo) { masterInfo *mesos.MasterInfo) {
lmt := elekLogT.SUCCESS lmt := elekLogT.SUCCESS
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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) { func (s *BaseScheduler) LogFrameworkReregistered(masterInfo *mesos.MasterInfo) {
lmt := elekLogT.GENERAL lmt := elekLogT.GENERAL
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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() { func (s *BaseScheduler) LogDisconnected() {
lmt := elekLogT.WARNING lmt := elekLogT.WARNING
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.WarnLevel, log.WarnLevel,
log.Fields {}, "Framework disconnected with master") log.Fields{}, "Framework disconnected with master")
} }
func (s *BaseScheduler) LogTaskStatusUpdate(status *mesos.TaskStatus) { func (s *BaseScheduler) LogTaskStatusUpdate(status *mesos.TaskStatus) {
@ -402,16 +402,16 @@ func (s *BaseScheduler) LogTaskStatusUpdate(status *mesos.TaskStatus) {
default: default:
lmt = elekLogT.GENERAL lmt = elekLogT.GENERAL
} }
elektronLogging.ElektronLog.Log(lmt, elektronLogging.ElektronLog.Log(lmt,
log.InfoLevel, 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) { func (s *BaseScheduler) LogSchedPolicySwitch(name string, nextPolicy SchedPolicyState) {
logSPS := func() { logSPS := func() {
elektronLogging.ElektronLog.Log(elekLogT.SPS, elektronLogging.ElektronLog.Log(elekLogT.SPS,
log.InfoLevel, log.InfoLevel,
log.Fields {"Name" : name}, "") log.Fields{"Name": name}, "")
} }
if s.hasReceivedResourceOffers && (s.curSchedPolicy != nextPolicy) { if s.hasReceivedResourceOffers && (s.curSchedPolicy != nextPolicy) {
logSPS() logSPS()
@ -420,14 +420,14 @@ func (s *BaseScheduler) LogSchedPolicySwitch(name string, nextPolicy SchedPolicy
} }
// Logging the size of the scheduling window and the scheduling policy // Logging the size of the scheduling window and the scheduling policy
// that is going to schedule the tasks in the scheduling window. // 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.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) { func (s *BaseScheduler) LogClsfnAndTaskDistOverhead(overhead time.Duration) {
// Logging the overhead in microseconds. // Logging the overhead in microseconds.
elektronLogging.ElektronLog.Log(elekLogT.CLSFN_TASKDIST_OVERHEAD, elektronLogging.ElektronLog.Log(elekLogT.CLSFN_TASKDIST_OVERHEAD,
log.InfoLevel, 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)}, "")
} }

10
schedulers/bin-packing.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers

10
schedulers/electronScheduler.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers

10
schedulers/first-fit.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers

12
schedulers/helpers.go
View file

@ -23,26 +23,26 @@ import (
mesos "github.com/mesos/mesos-go/api/v0/mesosproto" mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
sched "github.com/mesos/mesos-go/api/v0/scheduler" sched "github.com/mesos/mesos-go/api/v0/scheduler"
"github.com/pkg/errors" "github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/constants" "github.com/spdfg/elektron/constants"
"github.com/spdfg/elektron/def" "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"
"github.com/spdfg/elektron/utilities/mesosUtils" "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) { func coLocated(tasks map[string]bool, s BaseScheduler) {
for task := range tasks { for task := range tasks {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Task" : task}, "") log.Fields{"Task": task}, "")
} }
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {}, "---------------------") log.Fields{}, "---------------------")
} }
// Get the powerClass of the given hostname. // Get the powerClass of the given hostname.

14
schedulers/schedPolicy.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers
@ -24,10 +24,10 @@ import (
mesos "github.com/mesos/mesos-go/api/v0/mesosproto" mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
sched "github.com/mesos/mesos-go/api/v0/scheduler" sched "github.com/mesos/mesos-go/api/v0/scheduler"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def" "github.com/spdfg/elektron/def"
"github.com/spdfg/elektron/elektronLogging" "github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types" elekLogT "github.com/spdfg/elektron/elektronLogging/types"
log "github.com/sirupsen/logrus"
) )
type SchedPolicyContext interface { type SchedPolicyContext interface {
@ -92,7 +92,7 @@ func switchTaskDistBased(baseSchedRef *BaseScheduler) string {
baseSchedRef.LogClsfnAndTaskDistOverhead(time.Now().Sub(startTime)) baseSchedRef.LogClsfnAndTaskDistOverhead(time.Now().Sub(startTime))
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, elektronLogging.ElektronLog.Log(elekLogT.GENERAL,
log.InfoLevel, log.InfoLevel,
log.Fields {"Task Distribution" : fmt.Sprintf("%f",taskDist)}, "Switching... ") log.Fields{"Task Distribution": fmt.Sprintf("%f", taskDist)}, "Switching... ")
if err != nil { if err != nil {
// All the tasks in the window were only classified into 1 cluster. // 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. // Max-Min and Max-GreedyMins would work the same way as Bin-Packing for this situation.

10
schedulers/states.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers

10
schedulers/store.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedulers package schedulers

10
utilities/mesosUtils/mesosUtils.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package mesosUtils package mesosUtils

26
utilities/offerUtils/offerUtils.go
View file

@ -1,31 +1,31 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package offerUtils package offerUtils
import ( import (
"strings" "fmt"
"fmt"
mesos "github.com/mesos/mesos-go/api/v0/mesosproto" mesos "github.com/mesos/mesos-go/api/v0/mesosproto"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/constants" "github.com/spdfg/elektron/constants"
"github.com/spdfg/elektron/elektronLogging" "github.com/spdfg/elektron/elektronLogging"
elekLogT "github.com/spdfg/elektron/elektronLogging/types" elekLogT "github.com/spdfg/elektron/elektronLogging/types"
log "github.com/sirupsen/logrus" "strings"
) )
func OfferAgg(offer *mesos.Offer) (float64, float64, float64) { func OfferAgg(offer *mesos.Offer) (float64, float64, float64) {
@ -90,14 +90,14 @@ func UpdateEnvironment(offer *mesos.Offer) {
var host = offer.GetHostname() var host = offer.GetHostname()
// If this host is not present in the set of hosts. // If this host is not present in the set of hosts.
if _, ok := constants.Hosts[host]; !ok { if _, ok := constants.Hosts[host]; !ok {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel, elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
log.Fields {"Adding host" : fmt.Sprintf("%s",host)}, "New host detected") log.Fields{"Adding host": fmt.Sprintf("%s", host)}, "New host detected")
// Add this host. // Add this host.
constants.Hosts[host] = struct{}{} constants.Hosts[host] = struct{}{}
// Get the power class of this host. // Get the power class of this host.
class := PowerClass(offer) class := PowerClass(offer)
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel, elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
log.Fields {"host" : fmt.Sprintf("%s",host), "PowerClass" : fmt.Sprintf("%s", class)}, "Registering the power class...") 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 new power class, register the power class.
if _, ok := constants.PowerClasses[class]; !ok { if _, ok := constants.PowerClasses[class]; !ok {
constants.PowerClasses[class] = make(map[string]struct{}) constants.PowerClasses[class] = make(map[string]struct{})

10
utilities/runAvg/runAvg.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
/* /*
A utility to calculate the running average. A utility to calculate the running average.

24
utilities/schedUtils/schedUtils.go
View file

@ -1,30 +1,30 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package schedUtils package schedUtils
import ( import (
"fmt" "fmt"
log "github.com/sirupsen/logrus"
"github.com/spdfg/elektron/def" "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" elekLogT "github.com/spdfg/elektron/elektronLogging/types"
log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/utilities"
) )
// Criteria for resizing the scheduling window. // Criteria for resizing the scheduling window.
@ -79,9 +79,9 @@ func (s *fillNextOfferCycle) apply(taskQueue []def.Task) (int, int) {
for _, task := range taskQueue { for _, task := range taskQueue {
numberOfTasksTraversed++ numberOfTasksTraversed++
for i := *task.Instances; i > 0; i-- { for i := *task.Instances; i > 0; i-- {
elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel, elektronLogging.ElektronLog.Log(elekLogT.GENERAL, log.InfoLevel,
log.Fields {}, fmt.Sprintf("Checking if Instance #%d of Task[%s] can be scheduled "+ log.Fields{}, fmt.Sprintf("Checking if Instance #%d of Task[%s] can be scheduled "+
"during the next offer cycle...", i, task.Name)) "during the next offer cycle...", i, task.Name))
if canSchedule(task) { if canSchedule(task) {
filledCPU += task.CPU filledCPU += task.CPU
filledRAM += task.RAM filledRAM += task.RAM

10
utilities/trackResourceUsage.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package utilities package utilities

10
utilities/utils.go
View file

@ -1,20 +1,20 @@
// Copyright (C) 2018 spdfg // Copyright (C) 2018 spdfg
// //
// This file is part of Elektron. // This file is part of Elektron.
// //
// Elektron is free software: you can redistribute it and/or modify // Elektron is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// Elektron is distributed in the hope that it will be useful, // Elektron is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Elektron. If not, see <http://www.gnu.org/licenses/>. // along with Elektron. If not, see <http://www.gnu.org/licenses/>.
// //
package utilities package utilities