Merged in resourceUsageTracking (pull request #2)

ResourceUsageTracking Approved-by: Akash Kothawale <[email protected]> Approved-by: Pradyumna Kaushik <[email protected]>
spdfg · Sep 23, 2018 · 6c77aa7 · 6c77aa7
1 parent ec18b61
commit 6c77aa7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/def/taskUtils.go b/def/taskUtils.go
@@ -3,7 +3,7 @@ package def
 import (
 	"errors"
 	"fmt"
-	"github.com/mdesenfants/gokmeans"
+	"github.com/mash/gokmeans"
 	"log"
 	"sort"
 )

diff --git a/schedulers/base.go b/schedulers/base.go
@@ -3,6 +3,7 @@ package schedulers
 import (
 	"bitbucket.org/sunybingcloud/elektron/def"
 	elecLogDef "bitbucket.org/sunybingcloud/elektron/logging/def"
+        "bitbucket.org/sunybingcloud/elektron/utilities"
 	"bitbucket.org/sunybingcloud/elektron/utilities/schedUtils"
 	"bytes"
 	"fmt"
@@ -187,6 +188,7 @@ func (s *BaseScheduler) Disconnected(sched.SchedulerDriver) {
 }
 
 func (s *BaseScheduler) ResourceOffers(driver sched.SchedulerDriver, offers []*mesos.Offer) {
+	utilities.RecordTotalResourceAvailability(offers)
 	for _, offer := range offers {
 		if _, ok := s.HostNameToSlaveID[offer.GetHostname()]; !ok {
 			s.HostNameToSlaveID[offer.GetHostname()] = offer.GetSlaveId().GoString()
@@ -212,6 +214,9 @@ func (s *BaseScheduler) StatusUpdate(driver sched.SchedulerDriver, status *mesos
 	if *status.State == mesos.TaskState_TASK_RUNNING {
 		s.tasksRunning++
 	} else if IsTerminal(status.State) {
+		// Update resource availability.
+		utilities.ResourceAvailabilityUpdate("ON_TASK_TERMINAL_STATE",
+			*status.TaskId, *status.SlaveId)
 		s.TasksRunningMutex.Lock()
 		delete(s.Running[status.GetSlaveId().GoString()], *status.TaskId.Value)
 		s.TasksRunningMutex.Unlock()