diff options
| -rw-r--r-- | weed/server/volume_server.go | 1 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_admin.go | 10 | ||||
| -rw-r--r-- | weed/storage/store.go | 11 |
3 files changed, 0 insertions, 22 deletions
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index e94211c11..10a64a07b 100644 --- a/weed/server/volume_server.go +++ b/weed/server/volume_server.go @@ -51,7 +51,6 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, 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("/admin/volume/delete", vs.guard.WhiteList(vs.getVolumeDeleteHandler)) 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 e11ae9705..584a060e0 100644 --- a/weed/server/volume_server_handlers_admin.go +++ b/weed/server/volume_server_handlers_admin.go @@ -61,13 +61,3 @@ func (vs *VolumeServer) getVolumeUnmountHandler(w http.ResponseWriter, r *http.R vs.store.UnmountVolume(vid) writeJsonQuiet(w, r, http.StatusOK, "Volume unmounted") } - -func (vs *VolumeServer) getVolumeDeleteHandler(w http.ResponseWriter, r *http.Request) { - vid, err := vs.getVolumeId("volume", r) - if err != nil { - writeJsonError(w, r, http.StatusNotFound, err) - return - } - vs.store.DeleteVolume(vid) - writeJsonQuiet(w, r, http.StatusOK, "Volume deleted") -} diff --git a/weed/storage/store.go b/weed/storage/store.go index 9c250d50a..5b6270b6b 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -254,14 +254,3 @@ func (s *Store) UnmountVolume(i VolumeId) error { return fmt.Errorf("Volume %d not found on disk", i) } - -func (s *Store) DeleteVolume(i VolumeId) error { - for _, location := range s.Locations { - if error := location.deleteVolumeById(i); error == nil { - s.DeletedVolumeIdChan <- VolumeId(i) - return nil - } - } - - return fmt.Errorf("Volume %d not found on disk", i) -} |