5280b56d80
runtime: 0079-kata-runtime-fix-qemu-SCSIBus-info-not-saved-into-pe.patch 0080-kata-runtime-fix-the-block-device-not-removed-in-dev.patch 0081-kata-runtime-cut-too-long-message-in-grpc-log.patch 0082-kata-runtime-change-sandbox-state-to-unhealthy-when-.patch 0083-kata-runtime-add-removeMountBlockDevices-for-contain.patch 0084-kata-runtime-fix-validInterface-func-cause-crash-pro.patch 0085-kata-runtime-fix-kata-netmon-does-not-exit-when-cont.patch 0086-kata-runtime-add-checkCPUSet-before-create-container.patch 0087-kata-runtime-force-delete-the-sandbox-and-container.patch 0088-kata-runtime-check-sandbox-healthy-state-before-call.patch 0089-kata-add-support-for-update-iface.patch 0090-kata-set-sandbox-or-container-status-to-unhealthy.patch 0091-kata-runtime-add-sandbox-file-lock-while-call-GetSan.patch 0092-qemu-add-arm64-to-support-list-of-dimm.patch 0093-kata-runtime-add-timeout-for-grpcWaitProcessRequest.patch 0094-kata-runtime-fix-update-iface-clean-NIC-cause-route-.patch 0095-kata-runtime-fix-qemu-process-resource-resi.patch 0096-kata-containers-Move-from-query-cpus-to-query-cpus-f.patch agent: 0021-kata-agent-fix-sync-clock-not-work-problem.patch 0022-kata-agent-delete-container-id-from-sandbox-struct.patch 0023-kata-agent-modify-log-level.patch 0024-kata-agent-fix-agent.debug_console-not-work-when-bui.patch Signed-off-by: Vanient <xiadanni1@huawei.com> (cherry picked from commit f2d936028666741658157472b8de9d02187c6d55)
40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
From 5cba0d988eec5a200a28fdc71ad404bba5014bf3 Mon Sep 17 00:00:00 2001
|
|
From: jiangpengfei <jiangpengfei9@huawei.com>
|
|
Date: Mon, 14 Dec 2020 20:05:11 -0500
|
|
Subject: [PATCH] kata-agent: fix sync clock not work problem
|
|
|
|
reason: SyncClock goroutine is not started in the kata-agent,
|
|
so add SyncClock function back into kata-agent to make sync
|
|
clock func avaliable.
|
|
|
|
Conflict: NA
|
|
Reference:https://gitee.com/src-openeuler/kata-containers
|
|
Signed-off-by: jiangpengfei <jiangpengfei9@huawei.com>
|
|
---
|
|
agent.go | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/agent.go b/agent.go
|
|
index 50afd7a..c3d6524 100644
|
|
--- a/agent.go
|
|
+++ b/agent.go
|
|
@@ -1199,6 +1199,15 @@ func (s *sandbox) startGRPC() {
|
|
return
|
|
}
|
|
|
|
+ // accept the sync clock stream first
|
|
+ syncClockStream, err := l.Accept()
|
|
+ if err != nil {
|
|
+ agentLog.WithError(err).Warn("Failed to accpet the sync clock stream")
|
|
+ return
|
|
+ }
|
|
+
|
|
+ go SyncClock(syncClockStream)
|
|
+
|
|
// l is closed when Serve() returns
|
|
servErr = grpcServer.Serve(l)
|
|
if servErr != nil {
|
|
--
|
|
1.8.3.1
|
|
|