Merge pull request #612 from Kern--/remote-snapshotter-minor

Fix minor demux snapshotter issues

Author: Kern--

snapshotter/app/service.go

@@ -17,7 +17,6 @@ import (
 	"context"
 	"fmt"
 	"net"
-	"net/url"
 	"os"
 	"os/signal"
 	"strconv"
@@ -153,11 +152,7 @@ func initSnapshotter(ctx context.Context, config config.Config, cache cache.Cach
 		if err != nil {
 			return nil, err
 		}
-		u, err := url.Parse(response.Address)
-		if err != nil {
-			return nil, err
-		}
-		host := u.Hostname()
+		host := response.Address
 		port, err := strconv.ParseUint(response.SnapshotterPort, base10, bits32)
 		if err != nil {
 			return nil, err

snapshotter/internal/http_address_resolver.go

@@ -21,8 +21,10 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"strconv"
 	"syscall"
 
+	"github.com/containerd/containerd/namespaces"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 
@@ -33,13 +35,15 @@ import (
 
 var (
 	port               int
+	remotePort         int
 	containerdSockPath string
 	logger             *logrus.Logger
 )
 
 func init() {
 	flag.IntVar(&port, "port", 10001, "service port for address resolver")
 	flag.StringVar(&containerdSockPath, "containerdSocket", "/run/firecracker-containerd/containerd.sock", "filepath to the containerd socket")
+	flag.IntVar(&remotePort, "remotePort", 10000, "the remote port on which the remote snapshotter is listening")
 	logger = logrus.New()
 }
 
@@ -71,7 +75,7 @@ func main() {
 
 	http.HandleFunc("/address", queryAddress)
 	httpServer := &http.Server{
-		Addr: fmt.Sprintf(":%d", port),
+		Addr: fmt.Sprintf("127.0.0.1:%d", port),
 	}
 
 	logger.Info(fmt.Sprintf("http resolver serving at port %d", port))
@@ -117,7 +121,8 @@ func queryAddress(writ http.ResponseWriter, req *http.Request) {
 	}
 	defer fcClient.Close()
 
-	vmInfo, err := fcClient.GetVMInfo(req.Context(), &proto.GetVMInfoRequest{VMID: namespace})
+	ctx := namespaces.WithNamespace(req.Context(), namespace)
+	vmInfo, err := fcClient.GetVMInfo(ctx, &proto.GetVMInfoRequest{VMID: namespace})
 	if err != nil {
 		logger.WithField("VMID", namespace).WithError(err).Error("unable to retrieve VM Info")
 		http.Error(writ, "Internal server error", http.StatusInternalServerError)
@@ -127,8 +132,9 @@ func queryAddress(writ http.ResponseWriter, req *http.Request) {
 	writ.WriteHeader(http.StatusOK)
 
 	response, err := json.Marshal(proxyaddress.Response{
-		Network: "unix",
-		Address: vmInfo.VSockPath,
+		Network:         "unix",
+		Address:         vmInfo.VSockPath,
+		SnapshotterPort: strconv.Itoa(remotePort),
 	})
 	if err != nil {
 		http.Error(writ, "Internal server error", http.StatusInternalServerError)