Merge pull request #1 from chrislusf/master

sync

1 files changed, 20 insertions, 8 deletions

diff --git a/weed/server/volume_server_handlers_ui.go b/weed/server/volume_server_handlers_ui.go
index 852f0b751..8d35c9c8b 100644
--- a/weed/server/volume_server_handlers_ui.go
+++ b/weed/server/volume_server_handlers_ui.go
@@ -8,6 +8,7 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
 	ui "github.com/chrislusf/seaweedfs/weed/server/volume_server_ui"
 	"github.com/chrislusf/seaweedfs/weed/stats"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
@@ -20,19 +21,30 @@ func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request)
 			ds = append(ds, stats.NewDiskStatus(dir))
 		}
 	}
+	volumeInfos := vs.store.VolumeInfos()
+	var normalVolumeInfos, remoteVolumeInfos []*storage.VolumeInfo
+	for _, vinfo := range volumeInfos {
+		if vinfo.IsRemote() {
+			remoteVolumeInfos = append(remoteVolumeInfos, vinfo)
+		} else {
+			normalVolumeInfos = append(normalVolumeInfos, vinfo)
+		}
+	}
 	args := struct {
-		Version      string
-		Masters      []string
-		Volumes      interface{}
-		EcVolumes    interface{}
-		DiskStatuses interface{}
-		Stats        interface{}
-		Counters     *stats.ServerStats
+		Version       string
+		Masters       []string
+		Volumes       interface{}
+		EcVolumes     interface{}
+		RemoteVolumes interface{}
+		DiskStatuses  interface{}
+		Stats         interface{}
+		Counters      *stats.ServerStats
 	}{
 		util.VERSION,
 		vs.SeedMasterNodes,
-		vs.store.Status(),
+		normalVolumeInfos,
 		vs.store.EcVolumes(),
+		remoteVolumeInfos,
 		ds,
 		infos,
 		serverStats,