move volume mount/unmount on volume server to grpc

3 files changed, 32 insertions, 22 deletions

diff --git a/weed/server/volume_grpc_admin.go b/weed/server/volume_grpc_admin.go
index af08a38f9..f0b57b35a 100644
--- a/weed/server/volume_grpc_admin.go
+++ b/weed/server/volume_grpc_admin.go
@@ -46,3 +46,35 @@ func (vs *VolumeServer) AssignVolume(ctx context.Context, req *volume_server_pb.
 	return resp, err
 
 }
+
+func (vs *VolumeServer) VolumeMount(ctx context.Context, req *volume_server_pb.VolumeMountRequest) (*volume_server_pb.VolumeMountResponse, error) {
+
+	resp := &volume_server_pb.VolumeMountResponse{}
+
+	err := vs.store.MountVolume(storage.VolumeId(req.VolumdId))
+
+	if err != nil {
+		glog.Errorf("volume mount %v: %v", req, err)
+	} else {
+		glog.V(2).Infof("volume mount %v", req)
+	}
+
+	return resp, err
+
+}
+
+func (vs *VolumeServer) VolumeUnmount(ctx context.Context, req *volume_server_pb.VolumeUnmountRequest) (*volume_server_pb.VolumeUnmountResponse, error) {
+
+	resp := &volume_server_pb.VolumeUnmountResponse{}
+
+	err := vs.store.UnmountVolume(storage.VolumeId(req.VolumdId))
+
+	if err != nil {
+		glog.Errorf("volume unmount %v: %v", req, err)
+	} else {
+		glog.V(2).Infof("volume unmount %v", req)
+	}
+
+	return resp, err
+
+}
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go
index 10a64a07b..c0f3ef97e 100644
--- a/weed/server/volume_server.go
+++ b/weed/server/volume_server.go
@@ -49,8 +49,6 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
 	adminMux.HandleFunc("/status", vs.guard.WhiteList(vs.statusHandler))
 	adminMux.HandleFunc("/admin/sync/index", vs.guard.WhiteList(vs.getVolumeIndexContentHandler))
 	adminMux.HandleFunc("/admin/sync/data", vs.guard.WhiteList(vs.getVolumeDataContentHandler))
-	adminMux.HandleFunc("/admin/volume/mount", vs.guard.WhiteList(vs.getVolumeMountHandler))
-	adminMux.HandleFunc("/admin/volume/unmount", vs.guard.WhiteList(vs.getVolumeUnmountHandler))
 	adminMux.HandleFunc("/stats/counter", vs.guard.WhiteList(statsCounterHandler))
 	adminMux.HandleFunc("/stats/memory", vs.guard.WhiteList(statsMemoryHandler))
 	adminMux.HandleFunc("/stats/disk", vs.guard.WhiteList(vs.statsDiskHandler))
diff --git a/weed/server/volume_server_handlers_admin.go b/weed/server/volume_server_handlers_admin.go
index 584a060e0..de165bd3f 100644
--- a/weed/server/volume_server_handlers_admin.go
+++ b/weed/server/volume_server_handlers_admin.go
@@ -41,23 +41,3 @@ func (vs *VolumeServer) getVolume(volumeParameterName string, r *http.Request) (
 	}
 	return v, nil
 }
-
-func (vs *VolumeServer) getVolumeMountHandler(w http.ResponseWriter, r *http.Request) {
-	vid, err := vs.getVolumeId("volume", r)
-	if err != nil {
-		writeJsonError(w, r, http.StatusNotFound, err)
-		return
-	}
-	vs.store.MountVolume(vid)
-	writeJsonQuiet(w, r, http.StatusOK, "Volume mounted")
-}
-
-func (vs *VolumeServer) getVolumeUnmountHandler(w http.ResponseWriter, r *http.Request) {
-	vid, err := vs.getVolumeId("volume", r)
-	if err != nil {
-		writeJsonError(w, r, http.StatusNotFound, err)
-		return
-	}
-	vs.store.UnmountVolume(vid)
-	writeJsonQuiet(w, r, http.StatusOK, "Volume unmounted")
-}