diff --git a/patch/0001-add-image-load-time-and-append-image-names.patch b/patch/0001-add-image-load-time-and-append-image-names.patch index 0889d55b227433ea551a37dc1283d4aff28d9d91..0ce8be93f32c1583e5d9d19b4edd47e05843a000 100644 --- a/patch/0001-add-image-load-time-and-append-image-names.patch +++ b/patch/0001-add-image-load-time-and-append-image-names.patch @@ -1,7 +1,7 @@ -From cdcc00f2722603b873946a70c3dbd2a20539c1f8 Mon Sep 17 00:00:00 2001 +From 35753562ad1f8b4a7064f22ec68a5f2a65880663 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 2 Apr 2019 23:37:17 -0400 -Subject: [PATCH 01/38] add image load time and append image names +Subject: [PATCH 01/39] add image load time and append image names reason: 1. add image load time 2. append image names when pull image diff --git a/patch/0002-add-image-integration-check.patch b/patch/0002-add-image-integration-check.patch index 7e97c4b3efc5c515098ba3a944a0b5a6ffa73c75..75cce3645e827299f885670405a54dd37ea2ebb7 100644 --- a/patch/0002-add-image-integration-check.patch +++ b/patch/0002-add-image-integration-check.patch @@ -1,7 +1,7 @@ -From 86e894d775745604164dcb7d88c759b9e9f03772 Mon Sep 17 00:00:00 2001 +From 6afc49fcbcaf02f6c6e4d748e82f0549cd878427 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 4 Apr 2019 11:03:15 -0400 -Subject: [PATCH 02/38] add image integration check +Subject: [PATCH 02/39] add image integration check Signed-off-by: LiFeng --- diff --git a/patch/0003-vendor-support-setting-rootfs-quota.patch b/patch/0003-vendor-support-setting-rootfs-quota.patch index 14a2dd2856d01e1e3a49fe7b400c3d75b7808841..09c458373a21f6d6cf1d15727c02872fd14e4af4 100644 --- a/patch/0003-vendor-support-setting-rootfs-quota.patch +++ b/patch/0003-vendor-support-setting-rootfs-quota.patch @@ -1,7 +1,7 @@ -From b685adca2095026d371fe03622bed7305e46be83 Mon Sep 17 00:00:00 2001 +From 25a6eac24a99570772cf9a28f58a41ed82cf784b Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Tue, 9 Apr 2019 01:32:27 -0400 -Subject: [PATCH 03/38] vendor: support setting rootfs quota +Subject: [PATCH 03/39] vendor: support setting rootfs quota Signed-off-by: TanYiFeng --- diff --git a/patch/0004-isulad-kit-vendor-check-overlay-support-as-docker.patch b/patch/0004-isulad-kit-vendor-check-overlay-support-as-docker.patch index 5e5e542c46ba362229ee591438b854529ca7d73e..be7c04685b9ce6979c57b0e6a4fe559c0aa35991 100644 --- a/patch/0004-isulad-kit-vendor-check-overlay-support-as-docker.patch +++ b/patch/0004-isulad-kit-vendor-check-overlay-support-as-docker.patch @@ -1,7 +1,7 @@ -From 9922ad9b93aa0c13af6dd4239829a67cfc9f6b61 Mon Sep 17 00:00:00 2001 +From 8ac69274e24f8d0df65c98aa7b2fbac7409b3f14 Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Tue, 9 Apr 2019 12:19:49 -0400 -Subject: [PATCH 04/38] isulad-kit-vendor: check overlay support as docker +Subject: [PATCH 04/39] isulad-kit-vendor: check overlay support as docker we may got failed if always detect multi lower layer mount, when writed data more than rootfs quota for arm machine diff --git a/patch/0005-isulad-kit-vendor-fix-parseSize-of-float-accurancy.patch b/patch/0005-isulad-kit-vendor-fix-parseSize-of-float-accurancy.patch index ef8cd28c6d2bf2e0b26e57f2022830150394fba2..140e41d30318b95f564587be33483a0e0ddd9249 100644 --- a/patch/0005-isulad-kit-vendor-fix-parseSize-of-float-accurancy.patch +++ b/patch/0005-isulad-kit-vendor-fix-parseSize-of-float-accurancy.patch @@ -1,7 +1,7 @@ -From 1b8bc8ba5587f86278230c982a33753c89ab8ea0 Mon Sep 17 00:00:00 2001 +From 36fe352fac38e4cf0cea88e72e00003697dd7ccf Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Tue, 16 Apr 2019 00:44:20 -0400 -Subject: [PATCH 05/38] isulad-kit-vendor: fix parseSize of float accurancy +Subject: [PATCH 05/39] isulad-kit-vendor: fix parseSize of float accurancy Signed-off-by: TanYiFeng --- diff --git a/patch/0006-limit-the-minimum-size-of-rootfs-quota-to-4k.patch b/patch/0006-limit-the-minimum-size-of-rootfs-quota-to-4k.patch index 5f4d75ccc9362269d02730c651d600df218edfe7..0ea738be17659fb1e94b301c8453c571ae458cb2 100644 --- a/patch/0006-limit-the-minimum-size-of-rootfs-quota-to-4k.patch +++ b/patch/0006-limit-the-minimum-size-of-rootfs-quota-to-4k.patch @@ -1,7 +1,7 @@ -From b1e3937ef5385c1f741ed339e230092831fcbebe Mon Sep 17 00:00:00 2001 +From 0b042537f1a40a054f94faea2b480cb8a435b324 Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Tue, 16 Apr 2019 10:53:52 -0400 -Subject: [PATCH 06/38] limit the minimum size of rootfs quota to 4k +Subject: [PATCH 06/39] limit the minimum size of rootfs quota to 4k Signed-off-by: TanYiFeng --- diff --git a/patch/0007-delete-try-to-delete-metadata-before-image-data.patch b/patch/0007-delete-try-to-delete-metadata-before-image-data.patch index 817ff08267a388c93ce58b429e4671df98ab53db..27b4108ffa8c0fe5d06e6bfa42f8fbb5d594399d 100644 --- a/patch/0007-delete-try-to-delete-metadata-before-image-data.patch +++ b/patch/0007-delete-try-to-delete-metadata-before-image-data.patch @@ -1,7 +1,7 @@ -From 19299059aa331dab7327dd77ead791ce3a0a7286 Mon Sep 17 00:00:00 2001 +From a8d2579b95b9a7f18785e337a6db31938063ec50 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 18 Apr 2019 05:04:18 -0400 -Subject: [PATCH 07/38] delete: try to delete metadata before image data +Subject: [PATCH 07/39] delete: try to delete metadata before image data Signed-off-by: LiFeng --- diff --git a/patch/0008-same-add-group-should-skip.patch b/patch/0008-same-add-group-should-skip.patch index f8c7adc3fc9a4351dacc814ebd3ce1bf503c9420..5fe843bfebc0a98f0d6de12d61dd9885cef65cd2 100644 --- a/patch/0008-same-add-group-should-skip.patch +++ b/patch/0008-same-add-group-should-skip.patch @@ -1,7 +1,7 @@ -From 5e63890c78f9be9a2f4f95ac9e4848430655bf14 Mon Sep 17 00:00:00 2001 +From 981d80d7f9608a9c61b880dcdda95449c0fc5096 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Fri, 19 Apr 2019 17:15:29 +0800 -Subject: [PATCH 08/38] same add group should skip +Subject: [PATCH 08/39] same add group should skip same add group should skip diff --git a/patch/0009-optimize-concurrent-run.patch b/patch/0009-optimize-concurrent-run.patch index 8a159f8b0d9ea29e2e59c2c2e099e0378816299c..a14107fedc22a657f8c4c52188b9fdf906157bf9 100644 --- a/patch/0009-optimize-concurrent-run.patch +++ b/patch/0009-optimize-concurrent-run.patch @@ -1,7 +1,7 @@ -From 548fc8099a07211f4729c9b5ebab507a75783f66 Mon Sep 17 00:00:00 2001 +From 981acc680c25b85aa783dea99aaf349a2940fe20 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Thu, 25 Apr 2019 18:00:18 +0800 -Subject: [PATCH 09/38] optimize concurrent run +Subject: [PATCH 09/39] optimize concurrent run Signed-off-by: LiuHao --- diff --git a/patch/0010-abnormal-scene-container-restart-failure.patch b/patch/0010-abnormal-scene-container-restart-failure.patch index 56289907fa8b6d59c973318e8a44627a8401dbeb..11fb523f01cac5735c6a2a9d2dd5746d1c142332 100644 --- a/patch/0010-abnormal-scene-container-restart-failure.patch +++ b/patch/0010-abnormal-scene-container-restart-failure.patch @@ -1,7 +1,7 @@ -From 9a36ef21c1216858932ec99de26864d05650f828 Mon Sep 17 00:00:00 2001 +From a1dc79376c725981962f311d66933a2b79fef9a2 Mon Sep 17 00:00:00 2001 From: WuJing Date: Mon, 29 Apr 2019 16:46:09 +0800 -Subject: [PATCH 10/38] abnormal scene container restart failure +Subject: [PATCH 10/39] abnormal scene container restart failure Solve the problem that the mountpoint.json write fails due to an abnormal condition, causing the container to fail to diff --git a/patch/0011-optimize-isulad_kit-operator.patch b/patch/0011-optimize-isulad_kit-operator.patch index d263afd9f0ad0d1f4b493ab3fd895ac606e66459..19ce6419c4a77d7724f784d4cfbf1fef4ca64968 100644 --- a/patch/0011-optimize-isulad_kit-operator.patch +++ b/patch/0011-optimize-isulad_kit-operator.patch @@ -1,7 +1,7 @@ -From b1e0c5606c33d0edb889581978682f99e391fcb2 Mon Sep 17 00:00:00 2001 +From 364c37cb29f26822452bf08770d690d1f9d22c42 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Thu, 2 May 2019 11:25:07 +0800 -Subject: [PATCH 11/38] optimize isulad_kit operator +Subject: [PATCH 11/39] optimize isulad_kit operator get mountpoint from driver diff --git a/patch/0012-fix-compile-error.patch b/patch/0012-fix-compile-error.patch index dc6787dd0ffbb815499cb24d70b650abb9c2b702..5f7ff92c515fd5d9cad8c91058068b6eb3c3c3e5 100644 --- a/patch/0012-fix-compile-error.patch +++ b/patch/0012-fix-compile-error.patch @@ -1,7 +1,7 @@ -From bedc96b8e5efde37fab6a07047de1e5e3526e495 Mon Sep 17 00:00:00 2001 +From 3be4acb8cc1c1ff00b150d50c4aaebcd98b040e5 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Thu, 2 May 2019 11:56:34 +0800 -Subject: [PATCH 12/38] fix compile error +Subject: [PATCH 12/39] fix compile error fix compile error diff --git a/patch/0013-rmi-try-to-remove-all-layers-info-when-rmi.patch b/patch/0013-rmi-try-to-remove-all-layers-info-when-rmi.patch index 07f1b2ff728f7d90da581da57e420c40710f8182..b5297896c401d828dbc3f1e0dd8f01ea7d028272 100644 --- a/patch/0013-rmi-try-to-remove-all-layers-info-when-rmi.patch +++ b/patch/0013-rmi-try-to-remove-all-layers-info-when-rmi.patch @@ -1,7 +1,7 @@ -From 094beaff346d67cecd95d726bdc2f9b7f288dc1d Mon Sep 17 00:00:00 2001 +From 32df7006bd864286ad1153d0c29016ff83a6fa97 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 7 May 2019 03:40:58 -0400 -Subject: [PATCH 13/38] rmi: try to remove all layers info when rmi +Subject: [PATCH 13/39] rmi: try to remove all layers info when rmi Signed-off-by: LiFeng --- diff --git a/patch/0014-isulad-kit-vendor-ensure-remove-container-rootfs-dir.patch b/patch/0014-isulad-kit-vendor-ensure-remove-container-rootfs-dir.patch index d2d7b674b425b4ca73e488f8a4f7ae04ecaeaf40..c750f8b98ceedeabb3cd1f75d4576da638a9195a 100644 --- a/patch/0014-isulad-kit-vendor-ensure-remove-container-rootfs-dir.patch +++ b/patch/0014-isulad-kit-vendor-ensure-remove-container-rootfs-dir.patch @@ -1,7 +1,7 @@ -From 9b677524de979c864138c61a5fe81738df4f45fa Mon Sep 17 00:00:00 2001 +From 2c62c38cfa3c4c43c0f94909492b2d8604aa0133 Mon Sep 17 00:00:00 2001 From: WuJing Date: Mon, 13 May 2019 09:31:43 +0800 -Subject: [PATCH 14/38] isulad-kit-vendor: ensure remove container rootfs dir +Subject: [PATCH 14/39] isulad-kit-vendor: ensure remove container rootfs dir when errmsg contain "File name too long" Signed-off-by: WuJing diff --git a/patch/0015-split-mountpoints.json-and-layers.json-in-save.patch b/patch/0015-split-mountpoints.json-and-layers.json-in-save.patch index 5201f533fe80fcebaaec661749127bfa6cd7fa1a..aa9c28534315c5d9c8763ca854aacd71d18b5ff6 100644 --- a/patch/0015-split-mountpoints.json-and-layers.json-in-save.patch +++ b/patch/0015-split-mountpoints.json-and-layers.json-in-save.patch @@ -1,7 +1,7 @@ -From 2167b566e1909703418ce0744ce960376b89712b Mon Sep 17 00:00:00 2001 +From 1f7af62d28f04385b3ed9a7a0cfadfd58aed0c16 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 13 May 2019 04:58:15 -0400 -Subject: [PATCH 15/38] split mountpoints.json and layers.json in save +Subject: [PATCH 15/39] split mountpoints.json and layers.json in save Signed-off-by: LiFeng --- diff --git a/patch/0016-isulad-kit-vendor-fix-bug-of-concurrent-run-with-quo.patch b/patch/0016-isulad-kit-vendor-fix-bug-of-concurrent-run-with-quo.patch index b7d50bd38a2296fb13c87ced15154ba853adfee5..c36597dd62e90c20c8261cab01f519f52174b229 100644 --- a/patch/0016-isulad-kit-vendor-fix-bug-of-concurrent-run-with-quo.patch +++ b/patch/0016-isulad-kit-vendor-fix-bug-of-concurrent-run-with-quo.patch @@ -1,7 +1,7 @@ -From 3fab31b29b361d9341de6fe26e87547836eecf26 Mon Sep 17 00:00:00 2001 +From 54a96b51ad48c5a63d7d252d93c86b73f8d6553e Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Mon, 20 May 2019 10:05:08 -0400 -Subject: [PATCH 16/38] isulad-kit-vendor: fix bug of concurrent run with quota +Subject: [PATCH 16/39] isulad-kit-vendor: fix bug of concurrent run with quota reason: setProjectQuota using common mutex to avoid set the same project id for diffrent containers, this may also get the same diff --git a/patch/0017-isulad-kit-vendor-fix-compile-error.patch b/patch/0017-isulad-kit-vendor-fix-compile-error.patch index 68c4fd1e00a19f9cc9e3a10afd917dd0e993edcf..1af45a44c7ef3e0604ccf67e3a0f2611657d76dc 100644 --- a/patch/0017-isulad-kit-vendor-fix-compile-error.patch +++ b/patch/0017-isulad-kit-vendor-fix-compile-error.patch @@ -1,7 +1,7 @@ -From 30047f84edb198ec8086a71e4c23f967f0060217 Mon Sep 17 00:00:00 2001 +From f2af7671d759fa939272bdefef179b8901b75ed0 Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Mon, 20 May 2019 10:31:12 -0400 -Subject: [PATCH 17/38] isulad-kit-vendor: fix compile error +Subject: [PATCH 17/39] isulad-kit-vendor: fix compile error Signed-off-by: TanYiFeng --- diff --git a/patch/0018-remove-unused-code.patch b/patch/0018-remove-unused-code.patch index 27025b19ce9e73375bdb40d4078e4c5661fc33b6..82a8e04e02a72da239a405c8065864fef28fa029 100644 --- a/patch/0018-remove-unused-code.patch +++ b/patch/0018-remove-unused-code.patch @@ -1,7 +1,7 @@ -From d7359445de4f32a3a0f1cdd436274d79aac26590 Mon Sep 17 00:00:00 2001 +From 0fdfacb81ca71d8c673a796f6255779d0db4c627 Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Mon, 20 May 2019 10:45:55 -0400 -Subject: [PATCH 18/38] remove unused code +Subject: [PATCH 18/39] remove unused code Signed-off-by: TanYiFeng --- diff --git a/patch/0019-optimize-mount-operator.patch b/patch/0019-optimize-mount-operator.patch index 3ec2339be7c8db045d3c993f1333b69b3636fcca..c5214a968e2036d1a5035cf5562aa4bf75ca373e 100644 --- a/patch/0019-optimize-mount-operator.patch +++ b/patch/0019-optimize-mount-operator.patch @@ -1,7 +1,7 @@ -From a6ac890638c85f515a57de9ec6d68089f11d1db1 Mon Sep 17 00:00:00 2001 +From 1d54dcf0a0f60e459bb197053dc93f5fec8184e3 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Sat, 25 May 2019 16:45:28 +0800 -Subject: [PATCH 19/38] optimize mount operator +Subject: [PATCH 19/39] optimize mount operator 1. split mountpoints.json to each container 2. refactor mount operator diff --git a/patch/0020-Fix-file-retention-bug.patch b/patch/0020-Fix-file-retention-bug.patch index 20db933a37e82c4322816c3ec2677ef0ad892bd7..83cf70b30ce3de2c4984dac53d91f24a6c07dd15 100644 --- a/patch/0020-Fix-file-retention-bug.patch +++ b/patch/0020-Fix-file-retention-bug.patch @@ -1,7 +1,7 @@ -From 468eb9443f5cc83c6b28d10bff198aee2db70d77 Mon Sep 17 00:00:00 2001 +From fd5a56176cfd1f153c1c43772ef07deb0405092a Mon Sep 17 00:00:00 2001 From: WuJing Date: Mon, 10 Jun 2019 10:54:43 +0800 -Subject: [PATCH 20/38] Fix file retention bug +Subject: [PATCH 20/39] Fix file retention bug Signed-off-by: WuJing --- diff --git a/patch/0021-set-layer-MountCount-0-without-mount-point-file.patch b/patch/0021-set-layer-MountCount-0-without-mount-point-file.patch index 21d9f91f91a18e3316aa8e77782ef227ac902d0b..7d9b558e3d7e9d5030e2a8b8f4c5e025c34624c4 100644 --- a/patch/0021-set-layer-MountCount-0-without-mount-point-file.patch +++ b/patch/0021-set-layer-MountCount-0-without-mount-point-file.patch @@ -1,7 +1,7 @@ -From 28ca1594c837d2ff130c1b723c9b1647c83defeb Mon Sep 17 00:00:00 2001 +From 7fd2af2a6b891ba696b5ce510d05bb77323d7624 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 10 Jun 2019 09:41:44 -0400 -Subject: [PATCH 21/38] set layer MountCount = 0 without mount point file +Subject: [PATCH 21/39] set layer MountCount = 0 without mount point file Signed-off-by: LiFeng --- diff --git a/patch/0022-encrypt-auth-config-and-add-lock.patch b/patch/0022-encrypt-auth-config-and-add-lock.patch index 746c1c7542907cc479b2dcf0e8eea305394306e4..2b6daf598bdef1a58f4251654b3f43240fee8331 100644 --- a/patch/0022-encrypt-auth-config-and-add-lock.patch +++ b/patch/0022-encrypt-auth-config-and-add-lock.patch @@ -1,7 +1,7 @@ -From f14162c78be3889210d0330faf34d0dc36b55f38 Mon Sep 17 00:00:00 2001 +From 21c6093d78f1c2f7c2a55c1ab2a3971536986130 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Tue, 18 Jun 2019 14:12:33 +0800 -Subject: [PATCH 22/38] encrypt auth config and add lock +Subject: [PATCH 22/39] encrypt auth config and add lock Signed-off-by: WangFengTu --- diff --git a/patch/0023-Change-perm-and-add-max-file-size-check.patch b/patch/0023-Change-perm-and-add-max-file-size-check.patch index 33626076118f302515a9845a751fa6c698fcfcb2..6ca48f0b5226940667f5b4b44e30c8ae31af86cb 100644 --- a/patch/0023-Change-perm-and-add-max-file-size-check.patch +++ b/patch/0023-Change-perm-and-add-max-file-size-check.patch @@ -1,7 +1,7 @@ -From 9ca19bc09da38c1ea45e6097f1e998e17f29bbd9 Mon Sep 17 00:00:00 2001 +From 70d54a60c7cea88dc7888ac5603598c0d30c51c0 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Thu, 4 Jul 2019 16:19:56 +0800 -Subject: [PATCH 23/38] Change perm and add max file size check +Subject: [PATCH 23/39] Change perm and add max file size check Signed-off-by: WangFengTu --- diff --git a/patch/0024-force-remove-dir-with-rm-rf-in-overlay.patch b/patch/0024-force-remove-dir-with-rm-rf-in-overlay.patch index 3196f38e7a91479b0fc7f6ced67ef62ddd96c27e..d89e0d1b2a9a9acc479d3d654c6a1c8e18d3aee4 100644 --- a/patch/0024-force-remove-dir-with-rm-rf-in-overlay.patch +++ b/patch/0024-force-remove-dir-with-rm-rf-in-overlay.patch @@ -1,7 +1,7 @@ -From d20956459b15f6386e59262b82be0f1f28ba4e1b Mon Sep 17 00:00:00 2001 +From 398f36b4314564893da8ce5c86b6300476a8d1fc Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 18 Jul 2019 06:20:49 -0400 -Subject: [PATCH 24/38] force remove dir with rm -rf in overlay +Subject: [PATCH 24/39] force remove dir with rm -rf in overlay Signed-off-by: LiFeng --- diff --git a/patch/0025-EnsureRemoveAll-make-retry-count-from-5-to-50.patch b/patch/0025-EnsureRemoveAll-make-retry-count-from-5-to-50.patch index c96040535abe31088cdb51abc037ddb1f8957efa..19aef3d2d0168dc6ba0e3ec2417356a4721c3ec4 100644 --- a/patch/0025-EnsureRemoveAll-make-retry-count-from-5-to-50.patch +++ b/patch/0025-EnsureRemoveAll-make-retry-count-from-5-to-50.patch @@ -1,7 +1,7 @@ -From 8a2a332b0d9882fb63404a23c6b1188e1bf819f4 Mon Sep 17 00:00:00 2001 +From f657e54c6bd3f393ae35dce10955a53bc9c82750 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 22 Jul 2019 03:52:09 -0400 -Subject: [PATCH 25/38] EnsureRemoveAll make retry count from 5 to 50 +Subject: [PATCH 25/39] EnsureRemoveAll make retry count from 5 to 50 Signed-off-by: LiFeng --- diff --git a/patch/0026-report-error-log-when-openDir-failed.patch b/patch/0026-report-error-log-when-openDir-failed.patch index 46c240f3c834bd692e5a5c43e42663fbc4c981e2..0a957c467bb95c17b91f5b49f1c70ec1e9fb0e85 100644 --- a/patch/0026-report-error-log-when-openDir-failed.patch +++ b/patch/0026-report-error-log-when-openDir-failed.patch @@ -1,7 +1,7 @@ -From 9ff222891b089bc344168f24ed77bbe25c35186b Mon Sep 17 00:00:00 2001 +From 41d89c54722e674b0b5f24fa0374e57c7444f7f8 Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Fri, 26 Jul 2019 05:02:55 -0400 -Subject: [PATCH 26/38] report error log when openDir failed +Subject: [PATCH 26/39] report error log when openDir failed Signed-off-by: TanYiFeng --- diff --git a/patch/0027-ignore-ENOENT-if-direcotry-has-been-removed-when-fin.patch b/patch/0027-ignore-ENOENT-if-direcotry-has-been-removed-when-fin.patch index 5055857635e48e1287731870e1007093ecf208d0..c09784c6b602f618fd73c8ea83f1d93caaac3e01 100644 --- a/patch/0027-ignore-ENOENT-if-direcotry-has-been-removed-when-fin.patch +++ b/patch/0027-ignore-ENOENT-if-direcotry-has-been-removed-when-fin.patch @@ -1,7 +1,7 @@ -From a2c9c4362e1c11fb4cf85318adeebe8ab9ae140f Mon Sep 17 00:00:00 2001 +From b013ca63fd429d0605b64a82b285dfe9957aad6c Mon Sep 17 00:00:00 2001 From: TanYiFeng Date: Fri, 9 Aug 2019 04:56:23 -0400 -Subject: [PATCH 27/38] ignore ENOENT if direcotry has been removed when find +Subject: [PATCH 27/39] ignore ENOENT if direcotry has been removed when find next project id Signed-off-by: TanYiFeng diff --git a/patch/0028-fixbug-cause-by-remove-container.json-in-run-dir.patch b/patch/0028-fixbug-cause-by-remove-container.json-in-run-dir.patch index 87339d145f2ab3d4e0625e26658ac29d0eccf52e..f4ff68830b88ef338c88a86fc80c4700e84d3b90 100644 --- a/patch/0028-fixbug-cause-by-remove-container.json-in-run-dir.patch +++ b/patch/0028-fixbug-cause-by-remove-container.json-in-run-dir.patch @@ -1,7 +1,7 @@ -From 7f96fe0deff74b191d7980d59b4e54f9fe9f0d6a Mon Sep 17 00:00:00 2001 +From 13b2943797e4e1c3560624c400f902e6e56b7aa1 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Fri, 9 Aug 2019 17:07:33 +0800 -Subject: [PATCH 28/38] fixbug: cause by remove container.json in run dir +Subject: [PATCH 28/39] fixbug: cause by remove container.json in run dir Start container will load container.json in run dir. If it is not exist, start container will failed. diff --git a/patch/0029-Performace-optimization.patch b/patch/0029-Performace-optimization.patch index 523ff021a4c5da08c52c913c46d5b45a924ea749..24fa544eb8520109df41a70c1d36021e6cb6e3d2 100644 --- a/patch/0029-Performace-optimization.patch +++ b/patch/0029-Performace-optimization.patch @@ -1,7 +1,7 @@ -From 143001e83c03413706bedc521aa340424412e3fb Mon Sep 17 00:00:00 2001 +From 395835817c36909d8fabd74b202321294c78fa46 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Tue, 26 Nov 2019 22:06:55 -0500 -Subject: [PATCH 29/38] Performace optimization +Subject: [PATCH 29/39] Performace optimization 1.Seprate big json file to small json files. 2.Migation json files for above change. diff --git a/patch/0030-Support-load-multiple-images.patch b/patch/0030-Support-load-multiple-images.patch index 0555b19813fc9acf61af805871f5825590a21f6b..47a2720b6f3af6aed29d7cfab6e70f150e6a7662 100644 --- a/patch/0030-Support-load-multiple-images.patch +++ b/patch/0030-Support-load-multiple-images.patch @@ -1,7 +1,7 @@ -From f4316f11668c1085ce8ee3ea69b02d32e27985c3 Mon Sep 17 00:00:00 2001 +From a03fd8a35096d296de9ea0ce812169f3911ebab2 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Mon, 18 Nov 2019 21:20:52 -0500 -Subject: [PATCH 30/38] Support load multiple images +Subject: [PATCH 30/39] Support load multiple images Signed-off-by: WangFengTu --- diff --git a/patch/0031-SWR-response-406-Not-Acceptable-if-oci-image-in-firs.patch b/patch/0031-SWR-response-406-Not-Acceptable-if-oci-image-in-firs.patch index 2eb5d3fb1e32088c91021104821ad16efd6fde99..8cb08803732660729aa92ffdcc177807445310cf 100644 --- a/patch/0031-SWR-response-406-Not-Acceptable-if-oci-image-in-firs.patch +++ b/patch/0031-SWR-response-406-Not-Acceptable-if-oci-image-in-firs.patch @@ -1,7 +1,7 @@ -From d5e9f72e7f65657bde4ef5b1db032503c63f08d8 Mon Sep 17 00:00:00 2001 +From b03b9d3688a1bd03725b453b6d737571b1c7c117 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Fri, 29 Nov 2019 03:21:02 -0500 -Subject: [PATCH 31/38] SWR response "406: Not Acceptable" if oci image in +Subject: [PATCH 31/39] SWR response "406: Not Acceptable" if oci image in first Signed-off-by: WangFengTu diff --git a/patch/0032-log-message-of-get-mountpoint-failed.patch b/patch/0032-log-message-of-get-mountpoint-failed.patch index db45f4dd8ba548f3e15854cc395220156615440d..f5dce9799fb4ca22de2f69f452e7fbcc2f173219 100644 --- a/patch/0032-log-message-of-get-mountpoint-failed.patch +++ b/patch/0032-log-message-of-get-mountpoint-failed.patch @@ -1,7 +1,7 @@ -From b6fdeb9251102c7cbc7bd22c0f8fa00bf89f6cf4 Mon Sep 17 00:00:00 2001 +From 60f45659a07d3b402ceb499ca5c8fea20115e2a7 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Thu, 5 Dec 2019 10:13:52 +0800 -Subject: [PATCH 32/38] log message of get mountpoint failed +Subject: [PATCH 32/39] log message of get mountpoint failed Signed-off-by: LiuHao --- diff --git a/patch/0033-Save-config-to-disk-if-images-s-name-is-removed.patch b/patch/0033-Save-config-to-disk-if-images-s-name-is-removed.patch index 7811311008cd9f51d641b2931ad4e2a65a74b140..c1f48319728244ee557e5e5ca581d3f436bffd16 100644 --- a/patch/0033-Save-config-to-disk-if-images-s-name-is-removed.patch +++ b/patch/0033-Save-config-to-disk-if-images-s-name-is-removed.patch @@ -1,7 +1,7 @@ -From ed3ce43cbcc22dae9a100da8debe717ac053ed1f Mon Sep 17 00:00:00 2001 +From 96b5a98e3cd2d590276ac791a3a93e5ede4873a2 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Wed, 18 Dec 2019 07:29:06 -0500 -Subject: [PATCH 33/38] Save config to disk if images's name is removed +Subject: [PATCH 33/39] Save config to disk if images's name is removed Signed-off-by: WangFengTu --- diff --git a/patch/0034-Try-to-repair-lowers-file-if-current-layer-is-reusin.patch b/patch/0034-Try-to-repair-lowers-file-if-current-layer-is-reusin.patch index cf5bcf1e3b68c88e09851f497aa259658094e091..5c7ec9abd436f84337752b6e1f1e01f480b80553 100644 --- a/patch/0034-Try-to-repair-lowers-file-if-current-layer-is-reusin.patch +++ b/patch/0034-Try-to-repair-lowers-file-if-current-layer-is-reusin.patch @@ -1,7 +1,7 @@ -From 86bdb56ace11ef4a293f97255d276b20e8249f37 Mon Sep 17 00:00:00 2001 +From 4db42fe2c8140c7e7ffc064c6bef6c40a20fb469 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Mon, 30 Dec 2019 10:20:56 +0800 -Subject: [PATCH 34/38] Try to repair lowers file if current layer is reusing +Subject: [PATCH 34/39] Try to repair lowers file if current layer is reusing Signed-off-by: WangFengTu --- diff --git a/patch/0035-Fix-CVE-2018-15664.patch b/patch/0035-Fix-CVE-2018-15664.patch index b973f4da096d00f734924357cfdc3bbdf94b3809..b1f30e4d0dea77f97bf8236602085cd5c1b79f42 100644 --- a/patch/0035-Fix-CVE-2018-15664.patch +++ b/patch/0035-Fix-CVE-2018-15664.patch @@ -1,7 +1,7 @@ -From f60d3a63773c49df1a81023e8eae56551c30766e Mon Sep 17 00:00:00 2001 +From 7bc876f67bfc1a00b0b76a6ddf33c99d2b1a617a Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 5 Jun 2019 15:07:44 -0400 -Subject: [PATCH 35/38] Fix CVE-2018-15664 +Subject: [PATCH 35/39] Fix CVE-2018-15664 Cherry-pick moby/moby #39292 for CVE-2018-15664 fixes diff --git a/patch/0036-Change-interface-of-AES.patch b/patch/0036-Change-interface-of-AES.patch index a0a3d585b6c9f2e89af8d3b92f0d0f1cc4f834e0..d754de4c7ac7a05d31e3b52b0d398228821f53b4 100644 --- a/patch/0036-Change-interface-of-AES.patch +++ b/patch/0036-Change-interface-of-AES.patch @@ -1,7 +1,7 @@ -From 5bb1bd62dd632d7395589f6feb6254eadfb229c8 Mon Sep 17 00:00:00 2001 +From 6a40555040289a7802f0a0ba5c25ffc84e5e5fc1 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Fri, 17 Jan 2020 02:50:13 -0500 -Subject: [PATCH 36/38] Change interface of AES +Subject: [PATCH 36/39] Change interface of AES Signed-off-by: WangFengTu --- diff --git a/patch/0037-Change-iSulad-kit-to-iSulad-img.patch b/patch/0037-Change-iSulad-kit-to-iSulad-img.patch index ebf03c1a74a7d8c014f251b2ebfc1e620466715f..72a09325dcd9698c3e5116eb0af9c7d77f99f6f8 100644 --- a/patch/0037-Change-iSulad-kit-to-iSulad-img.patch +++ b/patch/0037-Change-iSulad-kit-to-iSulad-img.patch @@ -1,7 +1,7 @@ -From 7d27634b73228d8e9f1fefd3a4f482c2bcdb3c44 Mon Sep 17 00:00:00 2001 +From cdfabb0c92145298c2e30337823c618d6bb2bc84 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Tue, 21 Jan 2020 04:04:44 -0500 -Subject: [PATCH 37/38] Change iSulad-kit to iSulad-img +Subject: [PATCH 37/39] Change iSulad-kit to iSulad-img Signed-off-by: WangFengTu --- diff --git a/patch/0038-Fix-some-devicemapper-bugs.patch b/patch/0038-Fix-some-devicemapper-bugs.patch index e8980025219fa30627a2e7ae95d539398ef1edb2..a659d2c01ab7b28b6f6045230f62e1e2b6bc43d7 100644 --- a/patch/0038-Fix-some-devicemapper-bugs.patch +++ b/patch/0038-Fix-some-devicemapper-bugs.patch @@ -1,7 +1,7 @@ -From 2efeb150c3724d04927ad131b173e44bf100d892 Mon Sep 17 00:00:00 2001 +From 02b8d76615fd1d0118cdc56258b98feef25c6e34 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Sun, 19 Jan 2020 11:25:09 +0800 -Subject: [PATCH 38/38] Fix some devicemapper bugs +Subject: [PATCH 38/39] Fix some devicemapper bugs Signed-off-by: WangFengTu --- diff --git a/patch/0039-Fix-wrong-mount-count-and-avoid-failure-when-unmount.patch b/patch/0039-Fix-wrong-mount-count-and-avoid-failure-when-unmount.patch new file mode 100644 index 0000000000000000000000000000000000000000..9dcefbff1137fa43a4a9aaf794c700d7db3aad63 --- /dev/null +++ b/patch/0039-Fix-wrong-mount-count-and-avoid-failure-when-unmount.patch @@ -0,0 +1,55 @@ +From 5457b959c4c81c0e9836cd12b085eb5cfca44a7b Mon Sep 17 00:00:00 2001 +From: WangFengTu +Date: Thu, 20 Feb 2020 11:17:42 +0800 +Subject: [PATCH 39/39] Fix wrong mount count and avoid failure when unmounting + an unmounted mountpoint + +Add lock when unmount mountpoint to avoid wrong mount count. And check if +mountpoint is mounted when unmount it. + +Signed-off-by: WangFengTu +--- + .../containers/storage/drivers/devmapper/deviceset.go | 6 ++++-- + vendor/github.com/containers/storage/store.go | 6 ++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/vendor/github.com/containers/storage/drivers/devmapper/deviceset.go b/vendor/github.com/containers/storage/drivers/devmapper/deviceset.go +index 4ebad51..f61d698 100644 +--- a/vendor/github.com/containers/storage/drivers/devmapper/deviceset.go ++++ b/vendor/github.com/containers/storage/drivers/devmapper/deviceset.go +@@ -2481,8 +2481,10 @@ func (devices *DeviceSet) UnmountDevice(hash, mountPath string) error { + defer devices.Unlock() + + logrus.Debugf("devmapper: Unmount(%s)", mountPath) +- if err := unix.Unmount(mountPath, unix.MNT_DETACH); err != nil { +- return err ++ if m, _ := Mounted(mountPath); m { ++ if err := unix.Unmount(mountPath, unix.MNT_DETACH); err != nil { ++ return err ++ } + } + logrus.Debug("devmapper: Unmount done") + +diff --git a/vendor/github.com/containers/storage/store.go b/vendor/github.com/containers/storage/store.go +index 2ebd558..236eccd 100644 +--- a/vendor/github.com/containers/storage/store.go ++++ b/vendor/github.com/containers/storage/store.go +@@ -2835,13 +2835,11 @@ func (s *store) Unmount(id string, force bool) (bool, error) { + } + + rlstore.Lock() ++ defer rlstore.Unlock() + if modified, err := rlstore.Modified(); modified || err != nil { + rlstore.Load() + } +- exist := rlstore.Exists(id) +- rlstore.Unlock() +- +- if exist { ++ if rlstore.Exists(id) { + return rlstore.Unmount(id, force) + } + return false, ErrLayerUnknown +-- +2.19.1 + diff --git a/patch/series-patch.conf b/patch/series-patch.conf index 655cf6228d916bc28617f29362791203b2891985..8011e7b75d127e5de3aa30ad1aa9ec5f71c94ec5 100644 --- a/patch/series-patch.conf +++ b/patch/series-patch.conf @@ -36,3 +36,4 @@ 0036-Change-interface-of-AES.patch 0037-Change-iSulad-kit-to-iSulad-img.patch 0038-Fix-some-devicemapper-bugs.patch +0039-Fix-wrong-mount-count-and-avoid-failure-when-unmount.patch