PMM-13409 Fix update:getStatus failure after upgrade

percona · Oct 10, 2024 · 9c121a0 · 9c121a0
1 parent 9f00573
commit 9c121a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/managed/services/server/server.go b/managed/services/server/server.go
@@ -98,7 +98,7 @@ type Params struct {
 
 // NewServer returns new server for Server service.
 func NewServer(params *Params) (*Server, error) {
-	path := os.TempDir()
+	path := "/srv"
 	if _, err := os.Stat(path); err != nil {
 		return nil, errors.WithStack(err)
 	}
@@ -359,6 +359,12 @@ func (s *Server) StartUpdate(ctx context.Context, req *serverv1.StartUpdateReque
 
 // UpdateStatus returns PMM Server update status.
 func (s *Server) UpdateStatus(ctx context.Context, req *serverv1.UpdateStatusRequest) (*serverv1.UpdateStatusResponse, error) {
+	if _, err := os.Stat(s.pmmUpdateAuthFile); err != nil && os.IsNotExist(err) {
+		return &serverv1.UpdateStatusResponse{
+			Done: true,
+		}, nil
+	}
+
 	token, err := s.readUpdateAuthToken()
 	if err != nil {
 		return nil, err

diff --git a/managed/services/server/updater.go b/managed/services/server/updater.go
@@ -224,7 +224,7 @@ func (up *Updater) latest(ctx context.Context) ([]*version.DockerVersionInfo, *v
 }
 
 func (up *Updater) readFromFile() (*version.DockerVersionInfo, error) {
-	// Read from file, if it's not exist read from ENV variable, if it's not exist get the latest tag from DockerHub.
+	// Read from file, if it does not exist read from ENV variable, if it does not exist get the latest tag from DockerHub.
 	content, err := os.ReadFile(fileName)
 	if err != nil && !os.IsNotExist(err) {
 		up.l.WithError(err).Error("Failed to read file")