refactor(timesync): improve guest time sync (#53)

Author: ihexon

cmd/bauklotze/machine/start.go

@@ -138,7 +138,7 @@ func start(cmd *cobra.Command, args []string) error {
 
 		logrus.Infof("Starting machine %q\n", vmName)
 		go func() {
-			errCh <- shim.Start(ctx, mc, provider, dirs, startOpts)
+			errCh <- shim.Start(mc, provider, dirs, startOpts)
 		}()
 
 		select {

pkg/api/backend/timesync.go

@@ -7,29 +7,14 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"time"
 
 	"bauklotze/pkg/api/utils"
-	"bauklotze/pkg/machine"
 	"bauklotze/pkg/machine/env"
 	provider2 "bauklotze/pkg/machine/provider"
+	"bauklotze/pkg/machine/system"
 	"bauklotze/pkg/machine/vmconfigs"
 )
 
-type timeStruct struct {
-	Time string `json:"time"`
-	Tz   string `json:"tz"`
-}
-
-func getCurrentTime() *timeStruct {
-	currentTime := time.Now()
-	tz, _ := currentTime.Zone()
-	return &timeStruct{
-		Time: currentTime.Format("2006-01-02 15:04:05"),
-		Tz:   tz,
-	}
-}
-
 func getVMMc(vmName string) (*vmconfigs.MachineConfig, error) {
 	providers = provider2.GetAll()
 	for _, sprovider := range providers {
@@ -49,20 +34,16 @@ func getVMMc(vmName string) (*vmconfigs.MachineConfig, error) {
 }
 
 func TimeSync(w http.ResponseWriter, r *http.Request) {
-	timeSt := getCurrentTime()
-
 	name := utils.GetName(r)
 	mc, err := getVMMc(name)
-
 	if err != nil {
 		utils.Error(w, http.StatusInternalServerError, err)
 		return
 	}
-
-	if sshError := machine.CommonSSHSilent(mc.SSH.RemoteUsername, mc.SSH.IdentityPath, mc.Name, mc.SSH.Port, []string{"date -s " + "'" + timeSt.Time + "'"}); sshError != nil {
-		utils.Error(w, http.StatusInternalServerError, sshError)
+	err = system.TimeSync(mc)
+	if err != nil {
+		utils.Error(w, http.StatusInternalServerError, err)
 		return
 	}
-
-	utils.WriteResponse(w, http.StatusOK, timeSt)
+	utils.WriteResponse(w, http.StatusOK, "")
 }

pkg/machine/shim/host.go

@@ -4,7 +4,6 @@
 package shim
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"runtime"
@@ -176,7 +175,7 @@ func getMCsOverProviders(vmstubbers []vmconfigs.VMProvider) (map[string]*vmconfi
 	return mcs, nil
 }
 
-func Start(ctx context.Context, mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *define.MachineDirs, opts define.StartOptions) error {
+func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *define.MachineDirs, opts define.StartOptions) error {
 	var err error
 
 	if err := mc.Refresh(); err != nil {
@@ -262,6 +261,19 @@ func Start(ctx context.Context, mc *vmconfigs.MachineConfig, mp vmconfigs.VMProv
 		return fmt.Errorf("failed to update last boot time: %w", err)
 	}
 
+	const defaultTimeSyncInterval = 10 * time.Minute
+
+	go func() {
+		for {
+			logrus.Infof("Time sync starting...")
+			err := system.TimeSync(mc)
+			if err != nil {
+				logrus.Warnf("Time sync failed: %v", err)
+			}
+			time.Sleep(defaultTimeSyncInterval)
+		}
+	}()
+
 	for {
 		pids := []int32{int32(gvcmd.Process.Pid), int32(krunCmd.Process.Pid)}
 		running, err := system.IsProcesSAlive(pids)

pkg/machine/system/time.go

@@ -0,0 +1,20 @@
+//  SPDX-FileCopyrightText: 2024-2025 OOMOL, Inc. <https://www.oomol.com>
+//  SPDX-License-Identifier: MPL-2.0
+
+package system
+
+import (
+	"fmt"
+	"time"
+
+	"bauklotze/pkg/machine"
+	"bauklotze/pkg/machine/vmconfigs"
+)
+
+func TimeSync(mc *vmconfigs.MachineConfig) error {
+	syncTimeCmd := fmt.Sprintf("date -s @%d", time.Now().Unix())
+	if err := machine.CommonSSHSilent(mc.SSH.RemoteUsername, mc.SSH.IdentityPath, mc.Name, mc.SSH.Port, []string{syncTimeCmd}); err != nil {
+		return fmt.Errorf("failed to sync timestamp: %w", err)
+	}
+	return nil
+}