Skip to content

Commit 944d5c4

Browse files
committed
add a bunch of error logs
1 parent 1a626c9 commit 944d5c4

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

cluster/calcium/build_image.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ type richSpecs struct {
5050
func getRandomNode(c *calcium, podname string) (*types.Node, error) {
5151
nodes, err := c.ListPodNodes(podname, false)
5252
if err != nil {
53+
log.Errorf("Error during ListPodNodes for %s: %v", podname, err)
5354
return nil, err
5455
}
5556
if len(nodes) == 0 {
5657
err = fmt.Errorf("No nodes available in pod %s", podname)
57-
log.Debugf("Error during getRandomNode from %s: %v", podname, err)
58+
log.Errorf("Error during getRandomNode from %s: %v", podname, err)
5859
return nil, err
5960
}
6061

@@ -64,7 +65,7 @@ func getRandomNode(c *calcium, podname string) (*types.Node, error) {
6465
}
6566
nodename, err := c.scheduler.RandomNode(nodemap)
6667
if err != nil {
67-
log.Debugf("Error during getRandomNode from %s: %v", podname, err)
68+
log.Errorf("Error during getRandomNode from %s: %v", podname, err)
6869
return nil, err
6970
}
7071
if nodename == "" {

cluster/calcium/create_container.go

+13-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const (
3131
func (c *calcium) CreateContainer(specs types.Specs, opts *types.DeployOptions) (chan *types.CreateContainerMessage, error) {
3232
pod, err := c.store.GetPod(opts.Podname)
3333
if err != nil {
34+
log.Errorf("Error during GetPod for %s: %v", opts.Podname, err)
3435
return nil, err
3536
}
3637
if pod.Favor == types.CPU_PRIOR {
@@ -43,16 +44,17 @@ func (c *calcium) CreateContainer(specs types.Specs, opts *types.DeployOptions)
4344
func (c *calcium) createContainerWithMemoryPrior(specs types.Specs, opts *types.DeployOptions) (chan *types.CreateContainerMessage, error) {
4445
ch := make(chan *types.CreateContainerMessage)
4546
if opts.Memory < MEMORY_LOW_LIMIT { // 4194304 Byte = 4 MB, docker 创建容器的内存最低标准
46-
return ch, fmt.Errorf("Minimum memory limit allowed is 4MB")
47+
return ch, fmt.Errorf("Minimum memory limit allowed is 4MB, got %d", opts.Memory)
4748
}
4849
if opts.Count <= 0 { // Count 要大于0
49-
return ch, fmt.Errorf("Count must be positive")
50+
return ch, fmt.Errorf("Count must be positive, got %d", opts.Count)
5051
}
5152

5253
// TODO RFC 计算当前 app 部署情况的时候需要保证同一时间只有这个 app 的这个 entrypoint 在跑
5354
// 因此需要在这里加个全局锁,直到部署完毕才释放
5455
nodesInfo, err := c.allocMemoryPodResource(opts)
5556
if err != nil {
57+
log.Errorf("Error during allocMemoryPodResource with opts %v: %v", opts, err)
5658
return ch, err
5759
}
5860

@@ -98,12 +100,16 @@ func (c *calcium) doCreateContainerWithMemoryPrior(nodeInfo types.NodeInfo, spec
98100

99101
node, err := c.GetNode(opts.Podname, nodeInfo.Name)
100102
if err != nil {
103+
log.Errorf("Error during GetNode for %s, %s: %v", opts.Podname, nodeInfo.Name, err)
101104
return ms
102105
}
103106

104107
if err := pullImage(node, opts.Image, c.config.Timeout.CreateContainer); err != nil {
105108
for i := 0; i < nodeInfo.Deploy; i++ {
106-
ms[i].Error = err.Error()
109+
if err != nil {
110+
log.Errorf("Error during pullImage %s for %s: %v", opts.Image, nodeInfo.Name, err)
111+
ms[i].Error = err.Error()
112+
}
107113
}
108114
return ms
109115
}
@@ -115,6 +121,7 @@ func (c *calcium) doCreateContainerWithMemoryPrior(nodeInfo types.NodeInfo, spec
115121
ms[i].Nodename = node.Name
116122
ms[i].Memory = opts.Memory
117123
if err != nil {
124+
log.Errorf("Error during makeContainerOptions: %v", err)
118125
ms[i].Error = err.Error()
119126
c.store.UpdateNodeMem(opts.Podname, nodeInfo.Name, opts.Memory, "+") // 创建容器失败就要把资源还回去对不对?
120127
continue
@@ -216,6 +223,7 @@ func (c *calcium) createContainerWithCPUPrior(specs types.Specs, opts *types.Dep
216223
ch := make(chan *types.CreateContainerMessage)
217224
result, err := c.allocCPUPodResource(opts)
218225
if err != nil {
226+
log.Errorf("Error during allocCPUPodResource with opts %v: %v", opts, err)
219227
return ch, err
220228
}
221229

@@ -272,6 +280,7 @@ func (c *calcium) doCreateContainerWithCPUPrior(nodeName string, cpuMap []types.
272280
}
273281

274282
if err := pullImage(node, opts.Image, c.config.Timeout.CreateContainer); err != nil {
283+
log.Errorf("Error during pullImage: %v", err)
275284
for i := 0; i < len(ms); i++ {
276285
ms[i].Error = err.Error()
277286
}
@@ -286,6 +295,7 @@ func (c *calcium) doCreateContainerWithCPUPrior(nodeName string, cpuMap []types.
286295
ms[i].Nodename = node.Name
287296
ms[i].Memory = opts.Memory
288297
if err != nil {
298+
log.Errorf("Error during makeContainerOptions: %v", err)
289299
ms[i].Error = err.Error()
290300
c.releaseQuota(node, quota)
291301
continue

0 commit comments

Comments
 (0)