Merge pull request Terry-Mao#53 from StartFeng/master

优化gops UI & fix bugs

.gitignore

@@ -23,11 +23,8 @@ _testmain.go
 *.test
 *.prof
 *.gitattributes
-<<<<<<< HEAD
 
 *.iml
 *.ipr
 *.iws
 .idea/
-=======
->>>>>>> startfeng/master

directory/dispatcher.go

@@ -70,6 +70,7 @@ func (d *Dispatcher) Update(group map[int][]string,
 		if !write {
 			continue
 		}
+
 		// calc score
 		for _, sid = range stores {
 			totalAdd, totalAddDelay, restSpace, minScore = 0, 0, 0, 0

gops/models/ops/ops.go

@@ -69,7 +69,7 @@ func (o *Ops)LoadRacks() {
 	)
 
 	if racks, err = o.GetRack(); err != nil {
-		beego.Critical(err)
+		beego.Error(err)
 	}
 
 	global.STORES = make(map[string]*types.Store)
@@ -90,7 +90,7 @@ func (o *Ops)LoadGroups() {
 	)
 
 	if groups, err = o.GetGroup(); err != nil {
-		beego.Critical(err)
+		beego.Error(err)
 	}
 
 	global.IN_GROUP_STORES = make(map[string]*types.Store)
@@ -111,13 +111,13 @@ func (o *Ops)LoadGroups() {
 
 func (o *Ops)LoadVolumes() {
 	var (
-		volumes []*types.Group
+		volumes []*types.Volume
 		err error
-		volume *types.Group
+		volume *types.Volume
 	)
 
-	if volumes, err = o.GetGroup(); err != nil {
-		beego.Critical(err)
+	if volumes, err = o.GetVolume(); err != nil {
+		beego.Error(err)
 	}
 
 
@@ -178,12 +178,11 @@ func (o *Ops)AddGroup(stores []string, copys, racks int) (err error) {
 		storeId string
 	)
 
-	if len(stores) == 0 || len(stores) % copys != 0 {
+	if len(stores) == 0 {
 		err = addGroupParamsErr
 		return
 	}
 
-	stores = stores[0:copys]
 	groupId = global.MAX_GROUP_ID + 1
 	for _, storeId = range stores {
 		if err = o.zk.CreateGroup(groupId, storeId); err != nil {
@@ -209,7 +208,6 @@ func (o *Ops) AddVolume(groupId uint64, n int) (err error) {
 	for i := 0; i < n; i++ {
 
 		vid = global.MAX_VOLUME_ID + 1
-		beego.Info(vid)
 
 		for _, store = range group.Stores {
 			if err = o.store.AddVolume(store.Admin, vid); err != nil {

gops/models/types/types.go

@@ -8,6 +8,7 @@ type Store struct {
 	Admin  string `json:"admin"`
 	Rack   string `json:"rack"`
 	Status int `json:"status"`
+	Volumes []string `json:"volumes"`
 }
 
 type Rack struct {

gops/models/zk/zk.go

@@ -79,7 +79,6 @@ func (z *ZooKeeper) GetRack() (racks []*types.Rack, err error) {
 	if children, _, err = z.c.Children(_rackRoot); err != nil {
 		return
 	}
-
 	racks = make([]*types.Rack, len(children))
 	for i, child := range children {
 		rack = new(types.Rack)
@@ -99,6 +98,12 @@ func (z *ZooKeeper) GetRack() (racks []*types.Rack, err error) {
 			if err = json.Unmarshal(data, store); err != nil {
 				return
 			}
+
+			if store.Volumes , _, err = z.c.Children(_rackRoot + "/" + child  + "/" + child1); err != nil {
+				return
+			}
+
+
 			store.Ip = strings.Split(store.Stat, ":")[0]
 			rack.Stores[j] = store
 		}

gops/static/js/index.js

@@ -13,11 +13,13 @@ var myapp = ng.module('myapp', []);
 var storeInfo = function (host) {
     window.open("http://" + host + "/info")
 }
-var initFreeVolume = function(host){
+var initFreeVolume = function(host,storeId){
     var dailog = $('#initFreeVolumeDialog');
     var scope = dailog.scope();
     var formData = {}
+
     scope.formData = formData;
+    scope.storeId = storeId
     formData.host=host;
 
 
@@ -75,6 +77,8 @@ myapp.controller('freeStore', function ($scope, $http) {
             }).success(function (data) {
                 if (data.success){
                     alert("操作成功")
+                    var dailog = $('#freeStoreDialog');
+                    dailog.modal('hide');
                 }
             })
         }