bidengine: cap memory, disk

fixes #313

Author: boz

provider/bidengine/config.go

@@ -1,8 +1,10 @@
 package bidengine
 
 type config struct {
-	FulfillmentCPUMax uint `env:"AKASH_PROVIDER_MAX_FULFILLMENT_CPU" envDefault:"1000"`
+	FulfillmentCPUMax    int64 `env:"AKASH_PROVIDER_FULFILLMENT_CPU_MAX" envDefault:"1000"`
+	FulfillmentMemoryMax int64 `env:"AKASH_PROVIDER_FULFILLMENT_MEMORY_MAX" envDefault:"1073741824"` // 1Gi
+	FulfillmentDiskMax   int64 `env:"AKASH_PROVIDER_FULFILLMENT_DISK_MAX" envDefault:"5368709120"`   // 5Gi
 
-	FulfillmentMemPriceMin uint `env:"AKASH_PROVIDER_MEM_PRICE_MIN" envDefault:"50"`
-	FulfillmentMemPriceMax uint `env:"AKASH_PROVIDER_MEM_PRICE_MAX" envDefault:"150"`
+	FulfillmentMemPriceMin int64 `env:"AKASH_PROVIDER_MEM_PRICE_MIN" envDefault:"50"`
+	FulfillmentMemPriceMax int64 `env:"AKASH_PROVIDER_MEM_PRICE_MAX" envDefault:"150"`
 }

provider/bidengine/order.go

@@ -245,33 +245,50 @@ func (o *order) shouldBid(group *types.DeploymentGroup) bool {
 	var (
 		cpu   int64
 		mem   int64
+		disk  int64
 		price int64
 	)
 	for _, rg := range group.GetResources() {
 		cpu += int64(rg.Unit.CPU * rg.Count)
 		mem += int64(rg.Unit.Memory * uint64(rg.Count))
+		disk += int64(rg.Unit.Disk * uint64(rg.Count))
 		price += int64(rg.Price)
 	}
 
 	// requesting too much cpu?
-	if cpu > int64(o.config.FulfillmentCPUMax) || cpu <= 0 {
+	if cpu > o.config.FulfillmentCPUMax || cpu <= 0 {
 		o.log.Info("unable to fulfill: cpu request too high",
 			"cpu-requested", cpu)
 		return false
 	}
 
+	// requesting too much memory?
+	if mem > o.config.FulfillmentMemoryMax || mem <= 0 {
+		o.log.Info("unable to fulfill: memory request too high",
+			"memory-requested", mem)
+		return false
+	}
+
+	// requesting too much disk?
+	if disk > o.config.FulfillmentDiskMax || disk <= 0 {
+		o.log.Info("unable to fulfill: disk request too high",
+			"disk-requested", disk)
+		return false
+	}
+
 	// price max too low?
-	if price*unit.Gi < mem*int64(o.config.FulfillmentMemPriceMin) {
+	if price*unit.Gi < mem*o.config.FulfillmentMemPriceMin {
 		o.log.Info("unable to fulfill: price too low",
 			"max-price", price,
-			"min-price", mem*int64(o.config.FulfillmentMemPriceMin)/unit.Gi)
+			"min-price", mem*o.config.FulfillmentMemPriceMin/unit.Gi)
 		return false
 	}
 
 	return true
 }
 
 func (o *order) calculatePrice(resources types.ResourceList) uint64 {
+
 	// TODO: catch overflow
 	var (
 		mem  int64

provider/bidengine/service_test.go

@@ -163,7 +163,7 @@ func makeDeploymentGroup(daddr []byte, nonce uint64) *types.DeploymentGroup {
 	runit := types.ResourceUnit{
 		CPU:    500,
 		Memory: 256 * unit.Mi,
-		Disk:   5 * unit.Gi,
+		Disk:   1 * unit.Gi,
 	}
 
 	rgroup := types.ResourceGroup{