Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PMM-13409 Fix update status failure after upgrade #3234

Open
wants to merge 7 commits into
base: v3
Choose a base branch
from
Open

PMM-13409 Fix update status failure after upgrade #3234

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c121a0
PMM-13409 Fix update:getStatus failure after upgrade
ademidoff Oct 10, 2024
e462ad6
PMM-13409 remove the token after upgrade
ademidoff Oct 11, 2024
ad12d49
PMM-13409 fix the system attribute
ademidoff Oct 12, 2024
d3c77f7
Update managed/services/server/updater.go
ademidoff Oct 14, 2024
8634aa7
PMM-13409 do not depend on `IsRunning` flag to ship the logs
ademidoff Oct 14, 2024
be02c89
PMM-13409 get rid of the redundant task
ademidoff Oct 14, 2024
a159503
Merge branch 'PMM-13409-fix-update-status-failure-after-upgrade' of s…
ademidoff Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build/ansible/pmm-docker/update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,8 @@
file:
state: absent
path: /usr/share/pmm-server/maintenance/maintenance.html

- name: Remove the file provisioned by 'getStatus'
file:
state: absent
path: /srv/pmm-update.json
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 6 additions & 1 deletion build/ansible/roles/initialization/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
method: GET
retries: 20
delay: 5
ignore_errors: yes
ignore_errors: true

- name: init admin password on AMI
include_role:
Expand All @@ -139,4 +139,9 @@
file:
state: absent
path: /usr/share/pmm-server/maintenance/maintenance.html

- name: Remove the file provisioned by 'getStatus'
file:
state: absent
path: /srv/pmm-update.json
when: need_initialization or need_upgrade
8 changes: 7 additions & 1 deletion managed/services/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion managed/services/server/updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ 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.
content, err := os.ReadFile(fileName)
if err != nil && !os.IsNotExist(err) {
up.l.WithError(err).Error("Failed to read file")
Expand Down
Loading