Merge branch 'bug/build' into 'master'

fix build error

See merge request !68

Author: timfeirg

cluster/calcium/build_image.go

@@ -72,7 +72,9 @@ func getRandomNode(c *calcium, podname string) (*types.Node, error) {
 		return nil, err
 	}
 	if len(nodes) == 0 {
-		return nil, fmt.Errorf("No nodes available in pod %s", podname)
+		err = fmt.Errorf("No nodes available in pod %s", podname)
+		log.Debugf("Error during getRandomNode from %s: %v", podname, err)
+		return nil, err
 	}
 
 	nodemap := make(map[string]types.CPUMap)
@@ -81,6 +83,11 @@ func getRandomNode(c *calcium, podname string) (*types.Node, error) {
 	}
 	nodename, err := c.scheduler.RandomNode(nodemap)
 	if err != nil {
+		log.Debugf("Error during getRandomNode from %s: %v", podname, err)
+		return nil, err
+	}
+	if nodename == "" {
+		err = fmt.Errorf("Got empty node during getRandomNode from %s", podname)
 		return nil, err
 	}
 

cluster/calcium/meta.go

@@ -3,7 +3,10 @@ package calcium
 // All functions are just proxy to store, since I don't want store to be exported.
 // All these functions are meta data related.
 
-import "gitlab.ricebook.net/platform/core/types"
+import (
+	log "github.com/Sirupsen/logrus"
+	"gitlab.ricebook.net/platform/core/types"
+)
 
 func (c *calcium) ListPods() ([]*types.Pod, error) {
 	return c.store.GetAllPods()
@@ -50,14 +53,15 @@ func (c *calcium) ListPodNodes(podname string, all bool) ([]*types.Node, error)
 	var nodes []*types.Node
 	candidates, err := c.store.GetNodesByPod(podname)
 	if err != nil {
+		log.Debugf("Error during ListPodNodes from %s: %v", podname, err)
 		return nodes, err
 	}
 	for _, candidate := range candidates {
 		if candidate.Available || all {
 			nodes = append(nodes, candidate)
 		}
 	}
-	return nodes, err
+	return nodes, nil
 }
 
 func (c *calcium) GetContainer(id string) (*types.Container, error) {