Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-02 20:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

debugd: Correctly handle direct coordinator upload if coordinator was uploaded previously (file already exists)

Browse source 
Signed-off-by: Malte Poll <mp@edgeless.systems>
This commit is contained in:
Malte Poll 2022-04-20 16:11:48 +02:00 • committed by Malte Poll
parent f025afce98
commit 78af3b173f
5 changed files with 84 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

46
debugd/debugd/server/server.go
View file

@ -2,6 +2,9 @@ package server
import (
"context"
"errors"
"fmt"
"io/fs"
"log"
"net"
"sync"
@ -53,31 +56,38 @@ func (s *debugdServer) UploadCoordinator(stream pb.Debugd_UploadCoordinatorServe
Unit: debugd.CoordinatorSystemdUnitName,
Action: deploy.Stop,
})
log.Println("Starting coordinator upload")
if err := s.streamer.WriteStream(debugd.CoordinatorDeployFilename, stream, true); err != nil {
log.Printf("Uploading coordinator failed: %v\n", err)
return stream.SendAndClose(&pb.UploadCoordinatorResponse{
Status: pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_UPLOAD_FAILED,
})
}
log.Println("Successfully uploaded coordinator")
// after the upload succeeds, try to restart the coordinator
restartAction := deploy.ServiceManagerRequest{
Unit: debugd.CoordinatorSystemdUnitName,
Action: deploy.Restart,
}
if err := s.serviceManager.SystemdAction(stream.Context(), restartAction); err != nil {
log.Printf("Starting uploaded coordinator failed: %v\n", err)
return stream.SendAndClose(&pb.UploadCoordinatorResponse{
Status: pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_START_FAILED,
var responseStatus pb.UploadCoordinatorStatus
defer func() {
if err := s.serviceManager.SystemdAction(stream.Context(), restartAction); err != nil {
log.Printf("Starting uploaded coordinator failed: %v\n", err)
if responseStatus == pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_SUCCESS {
responseStatus = pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_START_FAILED
}
}
stream.SendAndClose(&pb.UploadCoordinatorResponse{
Status: responseStatus,
})
}()
log.Println("Starting coordinator upload")
if err := s.streamer.WriteStream(debugd.CoordinatorDeployFilename, stream, true); err != nil {
if errors.Is(err, fs.ErrExist) {
// coordinator was already uploaded
log.Println("Coordinator already uploaded")
responseStatus = pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_FILE_EXISTS
return nil
}
log.Printf("Uploading coordinator failed: %v\n", err)
responseStatus = pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_UPLOAD_FAILED
return fmt.Errorf("uploading coordinator failed: %w", err)
}
return stream.SendAndClose(&pb.UploadCoordinatorResponse{
Status: pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_SUCCESS,
})
log.Println("Successfully uploaded coordinator")
responseStatus = pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_SUCCESS
return nil
}
// DownloadCoordinator streams the local coordinator binary to other instances.

2
debugd/debugd/server/server_test.go
View file

@ -125,7 +125,7 @@ func TestUploadCoordinator(t *testing.T) {
writeStreamErr: errors.New("recv error"),
},
expectedResponseStatus: pb.UploadCoordinatorStatus_UPLOAD_COORDINATOR_UPLOAD_FAILED,
expectFile: true,
expectErr: true,
},
"starting coordinator fails": {
uploadChunks: [][]byte{