From 2e483250b2b76257952757c2283ee3895185ec80 Mon Sep 17 00:00:00 2001
From: zhongjiawei <zhongjiawei1@huawei.com>
Date: Thu, 8 Jun 2023 16:32:46 +0800
Subject: [PATCH] docker:thinpool full because docker daemon restart when
 docker pull

Signed-off-by: zhongjiawei <zhongjiawei1@huawei.com>
---
 VERSION-vendor                                |  2 +-
 docker.spec                                   |  8 +-
 git-commit                                    |  2 +-
 ...full-because-kill-docker-daemon-when.patch | 76 +++++++++++++++++++
 series.conf                                   |  1 +
 5 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 patch/0258-docker-thinpool-full-because-kill-docker-daemon-when.patch

diff --git a/VERSION-vendor b/VERSION-vendor
index 7ba9d16..dfa8e93 100644
--- a/VERSION-vendor
+++ b/VERSION-vendor
@@ -1 +1 @@
-18.09.0.323
+18.09.0.324
diff --git a/docker.spec b/docker.spec
index 7f8eca5..6550a20 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,6 +1,6 @@
 Name: docker-engine
 Version: 18.09.0
-Release: 323
+Release: 324
 Epoch: 2
 Summary: The open-source application container engine
 Group: Tools/Docker
@@ -229,6 +229,12 @@ fi
 %endif
 
 %changelog
+* Thu Jun 08 2023 zhongjiawei<zhongjiawei1@huawei.com> - 18.09.0-324
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:thinpool full because docker daemon restart when docker pull
+
 * Thu Apr 06 2023 zhongjiawei<zhongjiawei1@huawei.com> - 18.09.0-323
 - Type:CVE
 - CVE:CVE-2023-28840,CVE-2023-28841,CVE-2023-28842
diff --git a/git-commit b/git-commit
index d2dac95..2104741 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-172f8daba189d1c50663a252a90b2780f13f7f87
+6e4bf15b8a9b1ee7f1e2ec998e338319f3247148
diff --git a/patch/0258-docker-thinpool-full-because-kill-docker-daemon-when.patch b/patch/0258-docker-thinpool-full-because-kill-docker-daemon-when.patch
new file mode 100644
index 0000000..e085204
--- /dev/null
+++ b/patch/0258-docker-thinpool-full-because-kill-docker-daemon-when.patch
@@ -0,0 +1,76 @@
+From 436986d827c5ac91789d5877a40588f7af57c5b3 Mon Sep 17 00:00:00 2001
+From: zhongjiawei <zhongjiawei1@huawei.com>
+Date: Thu, 8 Jun 2023 16:25:48 +0800
+Subject: [PATCH] docker:thinpool full because kill docker daemon when docker
+
+---
+ components/engine/daemon/graphdriver/devmapper/driver.go | 8 ++++++--
+ components/engine/daemon/graphdriver/fsdiff.go           | 8 ++++++--
+ components/engine/layer/layer_store.go                   | 4 ++++
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/components/engine/daemon/graphdriver/devmapper/driver.go b/components/engine/daemon/graphdriver/devmapper/driver.go
+index 1eade3ab..3005b84e 100644
+--- a/components/engine/daemon/graphdriver/devmapper/driver.go
++++ b/components/engine/daemon/graphdriver/devmapper/driver.go
+@@ -127,8 +127,12 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) {
+ }
+ 
+ // GetAll not implemented
+-func (a *Driver) GetAll() []string {
+-	return []string{}
++func (d *Driver) GetAll() []string {
++        ids := []string{}
++        for id, _ := range d.DeviceSet.Devices {
++                ids = append(ids, id)
++        }
++        return ids
+ }
+ 
+ // CheckParent not implemented
+diff --git a/components/engine/daemon/graphdriver/fsdiff.go b/components/engine/daemon/graphdriver/fsdiff.go
+index e1f36850..b507c180 100644
+--- a/components/engine/daemon/graphdriver/fsdiff.go
++++ b/components/engine/daemon/graphdriver/fsdiff.go
+@@ -139,7 +139,12 @@ func (gdw *NaiveDiffDriver) ApplyDiff(id, parent string, diff io.Reader) (size i
+ 	if err != nil {
+ 		return
+ 	}
+-	defer driver.Put(id)
++	defer func() {
++		err1 := driver.Put(id)
++		if err1 != nil {
++			err = err1
++		}
++	}()
+ 
+ 	layerFs := layerRootFs.Path()
+ 	options := &archive.TarOptions{UIDMaps: gdw.uidMaps,
+@@ -150,7 +155,6 @@ func (gdw *NaiveDiffDriver) ApplyDiff(id, parent string, diff io.Reader) (size i
+ 		return
+ 	}
+ 	logrus.Debugf("Untar time: %vs", time.Now().UTC().Sub(start).Seconds())
+-
+ 	return
+ }
+ 
+diff --git a/components/engine/layer/layer_store.go b/components/engine/layer/layer_store.go
+index e3030c3c..f72c667a 100644
+--- a/components/engine/layer/layer_store.go
++++ b/components/engine/layer/layer_store.go
+@@ -502,8 +502,12 @@ func (ls *layerStore) CleanupRedundant(cs map[string]struct{}) error {
+ 	ids := ls.driver.GetAll()
+ 
+ 	for _, id := range ids {
++		if id == "" {
++			continue
++		}
+ 		if _, ok := cids[id]; !ok {
+ 			logrus.Warnf("remove redundant cacheID: %s", id)
++			ls.driver.Put(id)
+ 			ls.driver.Remove(id)
+ 		}
+ 	}
+-- 
+2.33.0
+
diff --git a/series.conf b/series.conf
index 96aee21..6f32f8a 100644
--- a/series.conf
+++ b/series.conf
@@ -255,4 +255,5 @@ patch/0254-docker-bugfix-fetch-the-right-device-number-which-great-tha.patch
 patch/0255-docker-libnet-d-overlay-extract-VNI-match-rule-builder.patch
 patch/0256-docker-libnet-d-overlay-document-some-encryption-code.patch
 patch/0257-docker-libnet-d-overlay-add-BPF-powered-VNI-matcher.patch
+patch/0258-docker-thinpool-full-because-kill-docker-daemon-when.patch
 #end