@@ -22,13 +22,13 @@ import (
2222 "net"
2323 "net/http"
2424 "os"
25+ "os/exec"
2526 "runtime/debug"
2627 "strconv"
2728 "strings"
2829 "sync"
29- "time"
30- "os/exec"
3130 "syscall"
31+ "time"
3232
3333 // disable gosec check for math/rand. We just need a random starting
3434 // place to start looking for CIDs; no need for cryptographically
@@ -152,8 +152,8 @@ type service struct {
152152 vsockPortMu sync.Mutex
153153
154154 // httpControlClient is to send pause/resume/snapshot commands to the microVM
155- httpControlClient * http.Client
156- firecrackerPid int
155+ httpControlClient * http.Client
156+ firecrackerPid int
157157 taskDrivePathOnHost string
158158}
159159
@@ -489,7 +489,7 @@ func (s *service) CreateVM(requestCtx context.Context, request *proto.CreateVMRe
489489 s .logger .WithError (err ).Error ("failed to publish start VM event" )
490490 }
491491
492- // Commented out because its execution cancels the shim, and
492+ // Commented out because its execution cancels the shim, and
493493 // it would get executed on Offload if we leave it, killing the shim,
494494 // and making snapshots impossible.
495495 //go s.monitorVMExit()
@@ -595,12 +595,14 @@ func (s *service) createVM(requestCtx context.Context, request *proto.CreateVMRe
595595
596596 s .createHTTPControlClient ()
597597
598- if pid , err := s .machine .PID (); err != nil {
598+ pid , err := s .machine .PID ()
599+ if err != nil {
599600 s .logger .WithError (err ).Error ("Failed to get PID of firecracker process" )
600601 return err
601- } else {
602- s .firecrackerPid = pid
603602 }
603+
604+ s .firecrackerPid = pid
605+
604606 s .logger .Info ("successfully started the VM" )
605607
606608 return nil
@@ -782,7 +784,7 @@ func (s *service) ResumeVM(ctx context.Context, req *proto.ResumeVMRequest) (*em
782784
783785// LoadSnapshot Loads a VM from a snapshot
784786func (s * service ) LoadSnapshot (ctx context.Context , req * proto.LoadSnapshotRequest ) (* empty.Empty , error ) {
785- if err := s .startFirecrackerProcess () ; err != nil {
787+ if err := s .startFirecrackerProcess (); err != nil {
786788 s .logger .WithError (err ).Error ("startFirecrackerProcess returned an error" )
787789 return nil , err
788790 }
@@ -894,7 +896,7 @@ func (s *service) buildVMConfiguration(req *proto.CreateVMRequest) (*firecracker
894896 s .logger .WithError (err ).Errorf ("Failed to delete %s" , logFilePath )
895897 return nil , err
896898 }
897- if _ , err := os .OpenFile (logFilePath , os .O_RDONLY | os .O_CREATE , 0666 ); err != nil {
899+ if _ , err := os .OpenFile (logFilePath , os .O_RDONLY | os .O_CREATE , 0600 ); err != nil {
898900 s .logger .WithError (err ).Errorf ("Failed to create %s" , logFilePath )
899901 return nil , err
900902 }
@@ -906,10 +908,10 @@ func (s *service) buildVMConfiguration(req *proto.CreateVMRequest) (*firecracker
906908 ID : "agent_api" ,
907909 }},
908910 // Put LogPath insteadof LogFifo here to comply with the new Firecracker logging
909- LogPath : logFilePath ,
910- MachineCfg : machineConfigurationFromProto (s .config , req .MachineCfg ),
911- LogLevel : s .config .DebugHelper .GetFirecrackerLogLevel (),
912- VMID : s .vmID ,
911+ LogPath : logFilePath ,
912+ MachineCfg : machineConfigurationFromProto (s .config , req .MachineCfg ),
913+ LogLevel : s .config .DebugHelper .GetFirecrackerLogLevel (),
914+ VMID : s .vmID ,
913915 }
914916
915917 if req .JailerConfig != nil {
@@ -1518,6 +1520,8 @@ func (s *service) cleanup() error {
15181520}
15191521
15201522// monitorVMExit watches the VM and cleanup resources when it terminates.
1523+ // Comment out because unused
1524+ /*
15211525func (s *service) monitorVMExit() {
15221526 // Block until the VM exits
15231527 if err := s.machine.Wait(s.shimCtx); err != nil && err != context.Canceled {
@@ -1528,6 +1532,7 @@ func (s *service) monitorVMExit() {
15281532 s.logger.WithError(err).Error("failed to clean up the VM")
15291533 }
15301534}
1535+ */
15311536
15321537func (s * service ) createHTTPControlClient () {
15331538 u := & httpunix.Transport {
@@ -1642,20 +1647,20 @@ func formCreateSnapReq(snapshotPath, memPath string) (*http.Request, error) {
16421647 return req , nil
16431648}
16441649
1645- func formPatchDriveReq (drive_id , path_on_host string ) (* http.Request , error ) {
1650+ func formPatchDriveReq (driveID , pathOnHost string ) (* http.Request , error ) {
16461651 var req * http.Request
16471652
16481653 data := map [string ]string {
1649- "drive_id" : drive_id ,
1650- "path_on_host" : path_on_host ,
1654+ "drive_id" : driveID ,
1655+ "path_on_host" : pathOnHost ,
16511656 }
16521657 json , err := json .Marshal (data )
16531658 if err != nil {
16541659 logrus .WithError (err ).Error ("Failed to marshal json data" )
16551660 return nil , err
16561661 }
16571662
1658- req , err = http .NewRequest ("PATCH" , fmt .Sprintf ("http+unix://firecracker/drives/%s" , drive_id ), bytes .NewBuffer (json ))
1663+ req , err = http .NewRequest ("PATCH" , fmt .Sprintf ("http+unix://firecracker/drives/%s" , driveID ), bytes .NewBuffer (json ))
16591664 if err != nil {
16601665 logrus .WithError (err ).Error ("Failed to create new HTTP request in formPauseReq" )
16611666 return nil , err
@@ -1674,14 +1679,13 @@ func (s *service) startFirecrackerProcess() error {
16741679 return err
16751680 }
16761681
1677-
16781682 // TODO: Remove hardcoding and make a parameter
16791683 logFilePath := fmt .Sprintf ("/tmp/log_%s_after.logs" , s .vmID )
16801684 if err := os .RemoveAll (logFilePath ); err != nil {
16811685 s .logger .WithError (err ).Errorf ("Failed to delete %s" , logFilePath )
16821686 return err
16831687 }
1684- if _ , err := os .OpenFile (logFilePath , os .O_RDONLY | os .O_CREATE , 0666 ); err != nil {
1688+ if _ , err := os .OpenFile (logFilePath , os .O_RDONLY | os .O_CREATE , 0600 ); err != nil {
16851689 s .logger .WithError (err ).Errorf ("Failed to create %s" , logFilePath )
16861690 return err
16871691 }
@@ -1706,4 +1710,4 @@ func (s *service) startFirecrackerProcess() error {
17061710 s .firecrackerPid = firecrackerCmd .Process .Pid
17071711
17081712 return nil
1709- }
1713+ }
0 commit comments