VOL-4697: Fixes for rolling update case
Also update build-base image to a newer version as old is not available anymore
Change-Id: Ifbe29a814bccbbe9fd39fff2d45bc5cefc636e1d
diff --git a/VERSION b/VERSION
index 1506473..5bc1cc4 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.6
\ No newline at end of file
+2.2.7
diff --git a/cmd/openonu-adapter/main.go b/cmd/openonu-adapter/main.go
index edc5088..07f6d50 100644
--- a/cmd/openonu-adapter/main.go
+++ b/cmd/openonu-adapter/main.go
@@ -199,7 +199,7 @@
logger.Infow(ctx, "fail-to-release-all-reservations", log.Fields{"error": err})
}
// Close the DB connection
- a.kvClient.Close(ctx)
+ go a.kvClient.Close(ctx)
}
if a.eventProxy != nil {
@@ -587,8 +587,12 @@
// Set the ONU adapter GRPC service as not ready. This will prevent any request from coming to this adapter instance
probe.UpdateStatusFromContext(probeCtx, onuAdapterService, probe.ServiceStatusStopped)
+ // Use context with cancel as etcd-client stop could take more time sometimes to stop slowing down container shutdown.
+ ctxWithCancel, cancelFunc := context.WithCancel(ctx)
// Cleanup before leaving
- ad.stop(ctx)
+ ad.stop(ctxWithCancel)
+ // Will halt any long-running stop routine gracefully
+ cancelFunc()
elapsed := time.Since(start)
logger.Infow(ctx, "run-time", log.Fields{"Name": "openadapter", "time": elapsed / time.Microsecond})