resolve comments for pr

Signed-off-by: Amory Hoste <[email protected]>

proto/types.proto

@@ -98,12 +98,13 @@ message IPConfiguration {
 message FirecrackerMachineConfiguration {
 	string CPUTemplate = 1; // Specifies the cpu template. Example: "T2" or "C3"
 	bool HtEnabled = 2; // Specifies if hyper-threading should be enabled
-	bool TrackDirtyPages = 3; // Specified if dirty-page-tracking should be enabled.
 	 // Specifies the memory size of VM
 	 // This lets us create a Firecracker VM of up to 4096 TiB, which
 	 // for a microVM should be large enough
-	uint32 MemSizeMib = 4;
-	uint32 VcpuCount = 5; // Specifies the number of vCPUs for the VM
+	uint32 MemSizeMib = 3;
+	uint32 VcpuCount = 4; // Specifies the number of vCPUs for the VM
+	bool TrackDirtyPages = 5; // Specified if dirty-page-tracking should be enabled.
+
 }
 
 // Message to specify the block device config for a Firecracker VM

runtime/service.go

@@ -274,22 +274,24 @@ func (s *service) startEventForwarders(remotePublisher shim.Publisher) {
 	go func() {
 		<-s.vmReady
 
-		if ! s.snapLoaded {
-			// Once the VM is ready, also start forwarding events from it to our exchange
-			attachCh := eventbridge.Attach(ctx, s.eventBridgeClient, s.eventExchange)
+		if s.snapLoaded {
+			return
+		}
 
-			err := <-attachCh
-			if err != nil && err != context.Canceled  && !strings.Contains(err.Error(), "context canceled") {
-				s.logger.WithError(err).Error("error while forwarding events from VM agent")
-			}
+		// Once the VM is ready, also start forwarding events from it to our exchange
+		attachCh := eventbridge.Attach(ctx, s.eventBridgeClient, s.eventExchange)
 
-			err = <-republishCh
-			if err != nil && err != context.Canceled {
-				s.logger.WithError(err).Error("error while republishing events")
-			}
+		err := <-attachCh
+		if err != nil && err != context.Canceled  && !strings.Contains(err.Error(), "context canceled") {
+			s.logger.WithError(err).Error("error while forwarding events from VM agent")
+		}
 
-			remotePublisher.Close()
+		err = <-republishCh
+		if err != nil && err != context.Canceled {
+			s.logger.WithError(err).Error("error while republishing events")
 		}
+
+		remotePublisher.Close()
 	}()
 }
 
@@ -736,7 +738,7 @@ func (s *service) StopVM(requestCtx context.Context, request *proto.StopVMReques
 
 // shutdownSnapLoadedVm shuts down a vm that has been loaded from a snapshot
 func (s *service) shutdownSnapLoadedVm() error {
-	// Kill firecracker process and its shild processes
+	// Kill firecracker process and its child processes
 	if err := syscall.Kill(-s.firecrackerPid, 9); err != nil {
 		s.logger.WithError(err).Error("Failed to kill firecracker process")
 		return err
@@ -1799,9 +1801,9 @@ func (s *service) monitorVMExit() {
 
 func (s *service) createHTTPControlClient() {
 	u := &httpunix.Transport{
-		DialTimeout:           1000 * time.Millisecond,
-		RequestTimeout:        60 * time.Second,
-		ResponseHeaderTimeout: 60 * time.Second,
+		DialTimeout:           500 * time.Millisecond,
+		RequestTimeout:        15 * time.Second,
+		ResponseHeaderTimeout: 15 * time.Second,
 	}
 	u.RegisterLocation("firecracker", s.shimDir.FirecrackerSockPath())
 
@@ -2178,7 +2180,7 @@ func (s *service) SendCreateSnapRequest(createSnapReq *http.Request) error {
 }
 
 // Offload Shuts down a VM and deletes the corresponding firecracker socket
-// and vsock. All of the other resources will persist. Depracated!
+// and vsock. All of the other resources will persist. DEPRECATED!
 func (s *service) Offload(ctx context.Context, req *proto.OffloadRequest) (*empty.Empty, error) {
 
 	if !s.snapLoaded {