Fixes, updates and refactor.

Author: Strabox

Gopkg.lock

@@ -39,7 +39,7 @@
 
 [[constraint]]
  name = "github.com/strabox/caravela"
- version = "0.2.1"
+ branch = "master"
 
 [prune]
  go-tests = true

Gopkg.toml

@@ -1,34 +1,35 @@
 [Caravela]
-RefreshingInterval = "30s"
-OffersStrategy = "chord-smart"
 Simulation = true
  # Cpu Cores Partitions
  [[Caravela.CpuCoresPartitions]]
  Cores = 1
- Percentage = 10
+ Percentage = 50
  [[Caravela.CpuCoresPartitions]]
  Cores = 2
- Percentage = 40
- [[Caravela.CpuCoresPartitions]]
- Cores = 4
  Percentage = 30
  [[Caravela.CpuCoresPartitions]]
- Cores = 8
+ Cores = 4
  Percentage = 20
  # Ram Partitions
  [[Caravela.RamPartitions]]
- Ram = 128
- Percentage = 25
- [[Caravela.RamPartitions]]
- Ram = 256
- Percentage = 25
- [[Caravela.RamPartitions]]
  Ram = 512
- Percentage = 25
+ Percentage = 50
  [[Caravela.RamPartitions]]
  Ram = 1024
- Percentage = 25
+ Percentage = 30
+ [[Caravela.RamPartitions]]
+ Ram = 2048
+ Percentage = 20
+ [Caravela.DiscoveryBackend]
+ Backend = "chord-smart" # chord-random, chord-smart
+ [Caravela.DiscoveryBackend.SmartChordBackend]
+ SupplyingInterval = "30s"
+ SpreadOffersInterval = "30s"
+ RefreshingInterval = "30s"
+ [Caravela.DiscoveryBackend.RandomChordBackend]
+ RandBackendMaxRetries = 4
 
 [Overlay]
-ChordNumSuccessors = 3
-ChordHashSizeBits = 128
+ [Overlay.Chord]
+ NumSuccessors = 3
+ HashSizeBits = 128

configuration.toml

@@ -4,6 +4,7 @@ import (
 "fmt"
 "github.com/BurntSushi/toml"
 "github.com/strabox/caravela-sim/util"
+"github.com/strabox/caravela/api/types"
 "time"
 )
 
@@ -18,26 +19,37 @@ const DefaultOutDirectoryPath = "out"
 
 // Configuration structure with initialization parameters for the simulator.
 type Configuration struct {
-NumberOfNodes int // Number of nodes used in the simulation.
-TickInterval duration // Interval between each simulator tick (in simulation time).
-MaxTicks int // Maximum number of ticks done by the simulator.
-Multithread bool // Used to leverage the multiple cores to speed up the simulation.
-RequestFeeder string // Used to feed the simulator with a series of requests.
-ResourceGenerator string // Strategy used to generate the resources for each node.
-OutDirectoryPath string // Path of the output's directory.
-SimulatorLogLevel string // Log's level of the simulator.
-CaravelaLogLevel string // Log's level of the CARAVELA's system.
+NumberOfNodes int // Number of nodes used in the simulation.
+TickInterval duration // Interval between each simulator tick (in simulation time).
+MaxTicks int // Maximum number of ticks done by the simulator.
+Multithread bool // Used to leverage the multiple cores to speed up the simulation.
+RequestFeeder string // Used to feed the simulator with a series of requests.
+ResourcesGenerator resourcesGenerator // Strategies used to generate the resources for each node.
+OutDirectoryPath string // Path of the output's directory.
+SimulatorLogLevel string // Log's level of the simulator.
+CaravelaLogLevel string // Log's level of the CARAVELA's system.
+}
+
+type resourcesGenerator struct {
+ResourceGenerator string
+StaticResources types.Resources
 }
 
 // Default creates the configuration structure for a basic/default simulation.
 func Default() *Configuration {
 return &Configuration{
-NumberOfNodes: 2500,
-TickInterval: duration{Duration: 10 * time.Second},
-MaxTicks: 15,
-Multithread: true,
-RequestFeeder: "random",
-ResourceGenerator: "partition-based",
+NumberOfNodes: 2500,
+TickInterval: duration{Duration: 10 * time.Second},
+MaxTicks: 15,
+Multithread: true,
+RequestFeeder: "random",
+ResourcesGenerator: resourcesGenerator{
+ResourceGenerator: "partition-aware",
+StaticResources: types.Resources{
+CPUs: 4,
+RAM: 4096,
+},
+},
 OutDirectoryPath: DefaultOutDirectoryPath,
 SimulatorLogLevel: DefaultSimLogLevel,
 CaravelaLogLevel: "info",
@@ -112,7 +124,11 @@ func (config *Configuration) Feeder() string {
 }
 
 func (config *Configuration) ResourceGen() string {
-return config.ResourceGenerator
+return config.ResourcesGenerator.ResourceGenerator
+}
+
+func (config *Configuration) StaticGeneratorResources() types.Resources {
+return config.ResourcesGenerator.StaticResources
 }
 
 func (config *Configuration) OutputDirectoryPath() string {
@@ -139,6 +155,7 @@ func (config *Configuration) Print() {
 util.Log.Infof("Multithread: %t", config.Multithreaded())
 util.Log.Infof("Request Feeder: %s", config.Feeder())
 util.Log.Infof("Resource Generator: %s", config.ResourceGen())
+util.Log.Infof("Static Gen Resources: <%d;%d>", config.StaticGeneratorResources().CPUs, config.StaticGeneratorResources().RAM)
 util.Log.Infof("Output directory: %s", config.OutputDirectoryPath())
 util.Log.Infof("Sim's log level: %s", config.SimulatorLogsLevel())
 util.Log.Infof("CARAVELA's log level: %s", config.CaravelaLogsLevel())

configuration/configuration.go

@@ -3,7 +3,6 @@ package caravela
 import (
 "context"
 "github.com/strabox/caravela-sim/simulation/metrics"
-"github.com/strabox/caravela-sim/util"
 "github.com/strabox/caravela/api/types"
 "github.com/strabox/caravela/configuration"
 )
@@ -30,7 +29,7 @@ func NewRemoteClientMock(nodeService NodeService, metricsCollector *metrics.Coll
 func (mock *RemoteClientMock) CreateOffer(ctx context.Context, fromSupp *types.Node, toTrader *types.Node,
 offer *types.Offer) error {
 
-node, nodeIndex := mock.nodeService.NodeByGUID(toTrader.GUID)
+node, nodeIndex := mock.nodeService.NodeByIP(toTrader.IP)
 
 // Collect Metrics
 mock.collector.APIRequestReceived(nodeIndex)
@@ -49,7 +48,7 @@ func (mock *RemoteClientMock) RefreshOffer(ctx context.Context, fromTrader, toSu
 }
 
 func (mock *RemoteClientMock) RemoveOffer(ctx context.Context, fromSupp, toTrader *types.Node, offer *types.Offer) error {
-node, nodeIndex := mock.nodeService.NodeByGUID(toTrader.GUID)
+node, nodeIndex := mock.nodeService.NodeByIP(toTrader.IP)
 
 // Collect Metrics
 mock.collector.APIRequestReceived(nodeIndex)
@@ -59,18 +58,18 @@ func (mock *RemoteClientMock) RemoveOffer(ctx context.Context, fromSupp, toTrade
 }
 
 func (mock *RemoteClientMock) GetOffers(ctx context.Context, fromNode, toTrader *types.Node, relay bool) ([]types.AvailableOffer, error) {
-node, nodeIndex := mock.nodeService.NodeByGUID(toTrader.GUID)
+node, nodeIndex := mock.nodeService.NodeByIP(toTrader.IP)
 
 // Collect Metrics
-mock.collector.IncrMessagesTradedRequest(ctx.Value(types.RequestCtxKey(util.SimRequestIDKey)).(string), 1)
+mock.collector.IncrMessagesTradedRequest(types.RequestID(ctx), 1)
 mock.collector.APIRequestReceived(nodeIndex)
 
 offers := node.GetOffers(ctx, fromNode, toTrader, relay)
 return offers, nil
 }
 
 func (mock *RemoteClientMock) AdvertiseOffersNeighbor(ctx context.Context, fromTrader, toNeighborTrader, traderOffering *types.Node) error {
-node, nodeIndex := mock.nodeService.NodeByGUID(toNeighborTrader.GUID)
+node, nodeIndex := mock.nodeService.NodeByIP(toNeighborTrader.IP)
 
 // Collect Metrics
 mock.collector.APIRequestReceived(nodeIndex)
@@ -84,7 +83,7 @@ func (mock *RemoteClientMock) LaunchContainer(ctx context.Context, fromBuyer, to
 node, nodeIndex := mock.nodeService.NodeByIP(toSupplier.IP)
 
 // Collect Metrics
-mock.collector.IncrMessagesTradedRequest(ctx.Value(types.RequestCtxKey(util.SimRequestIDKey)).(string), 1)
+mock.collector.IncrMessagesTradedRequest(types.RequestID(ctx), 1)
 mock.collector.APIRequestReceived(nodeIndex)
 
 return node.LaunchContainers(ctx, fromBuyer, offer, containersConfigs)

mocks/caravela/api_remote_client_mock.go

@@ -14,6 +14,8 @@ const containerIDSize = 64
 // ClientMock mocks the interactions with the docker daemon.
 // It implements the github.com/strabox/caravela/node/external DockerClient interface.
 type ClientMock struct {
+maxCPUS int
+maxRAM int
 numOfContainers int64
 containersRunning sync.Map
 resourcesGenerator ResourcesGenerator
@@ -22,6 +24,8 @@ type ClientMock struct {
 // NewClientMock creates a new docker client mock to be used.
 func NewClientMock(resourcesGenerator ResourcesGenerator) *ClientMock {
 return &ClientMock{
+maxCPUS: 0,
+maxRAM: 0,
 numOfContainers: 0,
 containersRunning: sync.Map{},
 resourcesGenerator: resourcesGenerator,
@@ -32,12 +36,19 @@ func (cliMock *ClientMock) ContainersRunning() int64 {
 return cliMock.numOfContainers
 }
 
+func (cliMock *ClientMock) MaxResourcesAvailable() (int, int) {
+return cliMock.maxCPUS, cliMock.maxRAM
+}
+
 // ===============================================================================
 // = DockerClient Interface =
 // ===============================================================================
 
 func (cliMock *ClientMock) GetDockerCPUAndRAM() (int, int) {
-return cliMock.resourcesGenerator.Generate()
+cpus, ram := cliMock.resourcesGenerator.Generate()
+cliMock.maxCPUS += cpus
+cliMock.maxRAM += ram
+return cpus, ram
 }
 
 func (cliMock *ClientMock) CheckContainerStatus(containerID string) (myContainer.ContainerStatus, error) {
@@ -50,7 +61,6 @@ func (cliMock *ClientMock) CheckContainerStatus(containerID string) (myContainer
 }
 
 func (cliMock *ClientMock) RunContainer(contConfig types.ContainerConfig) (*types.ContainerStatus, error) {
-
 // Generate a random ID for the container and store it in an HashMap
 randomContainerID := util.RandomString(containerIDSize)
 cliMock.containersRunning.Store(randomContainerID, nil)
@@ -66,7 +76,7 @@ func (cliMock *ClientMock) RunContainer(contConfig types.ContainerConfig) (*type
 func (cliMock *ClientMock) RemoveContainer(containerID string) error {
 if _, exist := cliMock.containersRunning.Load(containerID); exist {
 cliMock.containersRunning.Delete(containerID)
-cliMock.numOfContainers--
+atomic.AddInt64(&cliMock.numOfContainers, -1)
 }
 return nil
 }

mocks/docker/client_mock.go

@@ -1,6 +1,9 @@
 package docker
 
-import "github.com/strabox/caravela/configuration"
+import (
+"github.com/strabox/caravela-sim/util"
+"github.com/strabox/caravela/configuration"
+)
 
 type partitionAwareResourceGen struct {
 caravelaConfigs *configuration.Configuration
@@ -13,12 +16,43 @@ func newPartitionAwareResourceGen(caravelaConfigs *configuration.Configuration)
 }
 
 func (p *partitionAwareResourceGen) Generate() (int, int) {
-/*
-coresPartition := p.caravelaConfigs.CPUCoresPartitions()
-for _, partition := range coresPartition {
-partition.
+coresPartitions := make([]configuration.CPUCoresPartition, len(p.caravelaConfigs.CPUCoresPartitions()))
+ramPartitions := make([]configuration.RAMPartition, len(p.caravelaConfigs.RAMPartitions()))
+copy(coresPartitions, p.caravelaConfigs.CPUCoresPartitions())
+copy(ramPartitions, p.caravelaConfigs.RAMPartitions())
+
+acc := 0
+for i := range coresPartitions {
+currentPercentage := coresPartitions[i].Percentage
+coresPartitions[i].Percentage += acc
+acc += currentPercentage
+}
+
+acc = 0
+for i := range ramPartitions {
+currentPercentage := ramPartitions[i].Percentage
+ramPartitions[i].Percentage += acc
+acc += currentPercentage
+}
+
+randInt := util.RandomInteger(1, 100)
+prevCores := coresPartitions[0].Cores
+for i := range coresPartitions {
+if randInt <= coresPartitions[i].Percentage {
+prevCores = coresPartitions[i].Cores
+break
 }
-// TODO
-*/
-return 1, 256
+}
+
+randInt = util.RandomInteger(1, 100)
+prevRAM := ramPartitions[0].RAM
+for i := range ramPartitions {
+if randInt <= ramPartitions[i].Percentage {
+prevRAM = ramPartitions[i].RAM
+break
+}
+}
+
+util.Log.Debugf(util.LogTag("ResGen")+"MaxRes: <%d;%d>", prevCores, prevRAM)
+return prevCores, prevRAM
 }