1 Star 0 Fork 58

gnaygnil/docker

forked from src-openEuler/docker 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0089-libcontainerd-fix-stuck-when-containerd-in-T-.patch 1.28 KB
一键复制 编辑 原始数据 按行查看 历史
gnaygnil 提交于 2020-02-13 15:36 . docker: Fixed build error and URL
From 9a48f9b439a03e7fd5eeec4ff2cebac4cddf669f Mon Sep 17 00:00:00 2001
From: jingrui <jingrui@huawei.com>
Date: Wed, 30 Jan 2019 21:28:16 +0800
Subject: [PATCH 089/111] libcontainerd: fix stuck when containerd in
T-state
reason: when containerd is alive but not responding, shall restart
containerd avoid cmd stuck.
Change-Id: Iab220c8988b50b39f4fd84be9454a0b097968751
Signed-off-by: jingrui <jingrui@huawei.com>
---
components/engine/libcontainerd/supervisor/remote_daemon.go | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/engine/libcontainerd/supervisor/remote_daemon.go b/components/engine/libcontainerd/supervisor/remote_daemon.go
index 095300f753..c5da3a56fe 100644
--- a/components/engine/libcontainerd/supervisor/remote_daemon.go
+++ b/components/engine/libcontainerd/supervisor/remote_daemon.go
@@ -307,7 +307,7 @@ func (r *remote) monitorDaemon(ctx context.Context) {
r.logger.WithError(err).WithField("binary", binaryName).Debug("daemon is not responding")
transientFailureCount++
- if transientFailureCount < maxConnectionRetryCount || system.IsProcessAlive(r.daemonPid) {
+ if transientFailureCount < maxConnectionRetryCount {
delay = time.After(time.Duration(transientFailureCount) * 200 * time.Millisecond)
continue
}
--
2.17.1
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/gnaygnil/docker.git
git@gitee.com:gnaygnil/docker.git
gnaygnil
docker
docker
master

搜索帮助