From 6e44d9522cb964a4d57a4ab43cc8949d449a8227 Mon Sep 17 00:00:00 2001
From: NickrenREN <renyuquan@caicloud.io>
Date: Mon, 29 Jan 2018 18:29:09 +0800
Subject: [PATCH] release local ephemeral storage resource when removing pod

---
 pkg/scheduler/schedulercache/cache_test.go | 62 ++++++++++++++++++++++
 pkg/scheduler/schedulercache/node_info.go  |  1 +
 2 files changed, 63 insertions(+)

diff --git a/pkg/scheduler/schedulercache/cache_test.go b/pkg/scheduler/schedulercache/cache_test.go
index ac02809647b..0eb184bdf3b 100644
--- a/pkg/scheduler/schedulercache/cache_test.go
+++ b/pkg/scheduler/schedulercache/cache_test.go
@@ -575,6 +575,68 @@ func TestExpireAddUpdatePod(t *testing.T) {
 	}
 }
 
+func makePodWithEphemeralStorage(nodeName, ephemeralStorage string) *v1.Pod {
+	req := v1.ResourceList{
+		v1.ResourceEphemeralStorage: resource.MustParse(ephemeralStorage),
+	}
+	return &v1.Pod{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "default-namespace",
+			Name:      "pod-with-ephemeral-storage",
+		},
+		Spec: v1.PodSpec{
+			Containers: []v1.Container{{
+				Resources: v1.ResourceRequirements{
+					Requests: req,
+				},
+			}},
+			NodeName: nodeName,
+		},
+	}
+}
+
+func TestEphemeralStorageResource(t *testing.T) {
+	nodeName := "node"
+	podE := makePodWithEphemeralStorage(nodeName, "500")
+	tests := []struct {
+		pod       *v1.Pod
+		wNodeInfo *NodeInfo
+	}{
+		{
+			pod: podE,
+			wNodeInfo: &NodeInfo{
+				requestedResource: &Resource{
+					EphemeralStorage: 500,
+				},
+				nonzeroRequest: &Resource{
+					MilliCPU: priorityutil.DefaultMilliCPURequest,
+					Memory:   priorityutil.DefaultMemoryRequest,
+				},
+				allocatableResource: &Resource{},
+				pods:                []*v1.Pod{podE},
+				usedPorts:           schedutil.HostPortInfo{},
+			},
+		},
+	}
+	for i, tt := range tests {
+		cache := newSchedulerCache(time.Second, time.Second, nil)
+		if err := cache.AddPod(tt.pod); err != nil {
+			t.Fatalf("AddPod failed: %v", err)
+		}
+		n := cache.nodes[nodeName]
+		deepEqualWithoutGeneration(t, i, n, tt.wNodeInfo)
+
+		if err := cache.RemovePod(tt.pod); err != nil {
+			t.Fatalf("RemovePod failed: %v", err)
+		}
+
+		n = cache.nodes[nodeName]
+		if n != nil {
+			t.Errorf("#%d: expecting pod deleted and nil node info, get=%s", i, n)
+		}
+	}
+}
+
 // TestRemovePod tests after added pod is removed, its information should also be subtracted.
 func TestRemovePod(t *testing.T) {
 	nodeName := "node"
diff --git a/pkg/scheduler/schedulercache/node_info.go b/pkg/scheduler/schedulercache/node_info.go
index 42b9ef46c83..345d9a48b01 100644
--- a/pkg/scheduler/schedulercache/node_info.go
+++ b/pkg/scheduler/schedulercache/node_info.go
@@ -376,6 +376,7 @@ func (n *NodeInfo) RemovePod(pod *v1.Pod) error {
 			n.requestedResource.MilliCPU -= res.MilliCPU
 			n.requestedResource.Memory -= res.Memory
 			n.requestedResource.NvidiaGPU -= res.NvidiaGPU
+			n.requestedResource.EphemeralStorage -= res.EphemeralStorage
 			if len(res.ScalarResources) > 0 && n.requestedResource.ScalarResources == nil {
 				n.requestedResource.ScalarResources = map[v1.ResourceName]int64{}
 			}