X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fapiv1-sdks.go;h=58154abe3be8d29fb2a6bb5a944114b70eb4c3e7;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=7bb976795b0a4283a980b157d42a3dd5a7124ab6;hpb=2a7a112bbffcd41a3436c086f1910ea7a9c94744;p=src%2Fxds%2Fxds-server.git diff --git a/lib/xdsserver/apiv1-sdks.go b/lib/xdsserver/apiv1-sdks.go index 7bb9767..58154ab 100644 --- a/lib/xdsserver/apiv1-sdks.go +++ b/lib/xdsserver/apiv1-sdks.go @@ -20,8 +20,8 @@ package xdsserver import ( "net/http" - common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" - "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" "github.com/gin-gonic/gin" ) @@ -74,8 +74,13 @@ func (s *APIService) installSdk(c *gin.Context) { return } + //increment lock xds counter: it will be decremented, + //when SDK is installed in file sdk.go in function ExitCB + //at line 308 or when install is aborted in following function + LockXdsUpdateCounter(s.Context, true) sdk, err := s.sdks.Install(id, args.Filename, args.Force, args.Timeout, args.InstallArgs, sess) if err != nil { + LockXdsUpdateCounter(s.Context, false) common.APIError(c, err.Error()) return } @@ -103,6 +108,7 @@ func (s *APIService) abortInstallSdk(c *gin.Context) { return } + LockXdsUpdateCounter(s.Context, false) c.JSON(http.StatusOK, sdk) } @@ -123,10 +129,12 @@ func (s *APIService) removeSdk(c *gin.Context) { s.Log.Debugln("Remove SDK id ", id) + LockXdsUpdateCounter(s.Context, true) delEntry, err := s.sdks.Remove(id, -1, sess) if err != nil { common.APIError(c, err.Error()) return } + LockXdsUpdateCounter(s.Context, false) c.JSON(http.StatusOK, delEntry) }