directory structure change to work with glide

glide has its own requirements. My previous workaround caused me some code checkin errors. Need to fix this.
2025-09-19 05:27:58 +08:00 · 2016-06-02 18:09:14 -07:00
parent caeffa3998
commit 5ce6bbf076
166 changed files with 296 additions and 272 deletions
--- a/weed/server/volume_server.go
+++ b/weed/server/volume_server.go
@@ -0,0 +1,125 @@
+package weed_server
+
+import (
+	"math/rand"
+	"net/http"
+	"sync"
+	"time"
+
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/security"
+	"github.com/chrislusf/seaweedfs/weed/storage"
+)
+
+type VolumeServer struct {
+	masterNode   string
+	mnLock       sync.RWMutex
+	pulseSeconds int
+	dataCenter   string
+	rack         string
+	store        *storage.Store
+	guard        *security.Guard
+
+	needleMapKind     storage.NeedleMapType
+	FixJpgOrientation bool
+	ReadRedirect      bool
+}
+
+func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
+	port int, publicUrl string,
+	folders []string, maxCounts []int,
+	needleMapKind storage.NeedleMapType,
+	masterNode string, pulseSeconds int,
+	dataCenter string, rack string,
+	whiteList []string,
+	fixJpgOrientation bool,
+	readRedirect bool) *VolumeServer {
+	vs := &VolumeServer{
+		pulseSeconds:      pulseSeconds,
+		dataCenter:        dataCenter,
+		rack:              rack,
+		needleMapKind:     needleMapKind,
+		FixJpgOrientation: fixJpgOrientation,
+		ReadRedirect:      readRedirect,
+	}
+	vs.SetMasterNode(masterNode)
+	vs.store = storage.NewStore(port, ip, publicUrl, folders, maxCounts, vs.needleMapKind)
+
+	vs.guard = security.NewGuard(whiteList, "")
+
+	adminMux.HandleFunc("/ui/index.html", vs.uiStatusHandler)
+	adminMux.HandleFunc("/status", vs.guard.WhiteList(vs.statusHandler))
+	adminMux.HandleFunc("/admin/assign_volume", vs.guard.WhiteList(vs.assignVolumeHandler))
+	adminMux.HandleFunc("/admin/vacuum/check", vs.guard.WhiteList(vs.vacuumVolumeCheckHandler))
+	adminMux.HandleFunc("/admin/vacuum/compact", vs.guard.WhiteList(vs.vacuumVolumeCompactHandler))
+	adminMux.HandleFunc("/admin/vacuum/commit", vs.guard.WhiteList(vs.vacuumVolumeCommitHandler))
+	adminMux.HandleFunc("/admin/delete_collection", vs.guard.WhiteList(vs.deleteCollectionHandler))
+	adminMux.HandleFunc("/admin/sync/status", vs.guard.WhiteList(vs.getVolumeSyncStatusHandler))
+	adminMux.HandleFunc("/admin/sync/index", vs.guard.WhiteList(vs.getVolumeIndexContentHandler))
+	adminMux.HandleFunc("/admin/sync/data", vs.guard.WhiteList(vs.getVolumeDataContentHandler))
+	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))
+	adminMux.HandleFunc("/delete", vs.guard.WhiteList(vs.batchDeleteHandler))
+	adminMux.HandleFunc("/", vs.privateStoreHandler)
+	if publicMux != adminMux {
+		// separated admin and public port
+		publicMux.HandleFunc("/favicon.ico", vs.faviconHandler)
+		publicMux.HandleFunc("/", vs.publicReadOnlyHandler)
+	}
+
+	go func() {
+		connected := true
+
+		glog.V(0).Infof("Volume server bootstraps with master %s", vs.GetMasterNode())
+		vs.store.SetBootstrapMaster(vs.GetMasterNode())
+		vs.store.SetDataCenter(vs.dataCenter)
+		vs.store.SetRack(vs.rack)
+		for {
+			glog.V(4).Infof("Volume server sending to master %s", vs.GetMasterNode())
+			master, secretKey, err := vs.store.SendHeartbeatToMaster()
+			if err == nil {
+				if !connected {
+					connected = true
+					vs.SetMasterNode(master)
+					vs.guard.SecretKey = secretKey
+					glog.V(0).Infoln("Volume Server Connected with master at", master)
+				}
+			} else {
+				glog.V(1).Infof("Volume Server Failed to talk with master %s: %v", vs.masterNode, err)
+				if connected {
+					connected = false
+				}
+			}
+			if connected {
+				time.Sleep(time.Duration(float32(vs.pulseSeconds*1e3)*(1+rand.Float32())) * time.Millisecond)
+			} else {
+				time.Sleep(time.Duration(float32(vs.pulseSeconds*1e3)*0.25) * time.Millisecond)
+			}
+		}
+	}()
+
+	return vs
+}
+
+func (vs *VolumeServer) GetMasterNode() string {
+	vs.mnLock.RLock()
+	defer vs.mnLock.RUnlock()
+	return vs.masterNode
+}
+
+func (vs *VolumeServer) SetMasterNode(masterNode string) {
+	vs.mnLock.Lock()
+	defer vs.mnLock.Unlock()
+	vs.masterNode = masterNode
+}
+
+func (vs *VolumeServer) Shutdown() {
+	glog.V(0).Infoln("Shutting down volume server...")
+	vs.store.Close()
+	glog.V(0).Infoln("Shut down successfully!")
+}
+
+func (vs *VolumeServer) jwt(fileId string) security.EncodedJwt {
+	return security.GenJwt(vs.guard.SecretKey, fileId)
+}