aboutsummaryrefslogtreecommitdiff
path: root/weed/topology
diff options
context:
space:
mode:
Diffstat (limited to 'weed/topology')
-rw-r--r--weed/topology/allocate_volume.go17
-rw-r--r--weed/topology/cluster_commands.go4
-rw-r--r--weed/topology/collection.go6
-rw-r--r--weed/topology/data_center.go2
-rw-r--r--weed/topology/data_node.go10
-rw-r--r--weed/topology/data_node_ec.go4
-rw-r--r--weed/topology/node.go6
-rw-r--r--weed/topology/rack.go2
-rw-r--r--weed/topology/store_replicate.go12
-rw-r--r--weed/topology/topology.go12
-rw-r--r--weed/topology/topology_ec.go8
-rw-r--r--weed/topology/topology_event_handling.go4
-rw-r--r--weed/topology/topology_map.go2
-rw-r--r--weed/topology/topology_test.go8
-rw-r--r--weed/topology/topology_vacuum.go8
-rw-r--r--weed/topology/volume_growth.go21
-rw-r--r--weed/topology/volume_growth_test.go6
-rw-r--r--weed/topology/volume_layout.go6
-rw-r--r--weed/topology/volume_location_list.go2
19 files changed, 71 insertions, 69 deletions
diff --git a/weed/topology/allocate_volume.go b/weed/topology/allocate_volume.go
index 48336092f..9dfd46825 100644
--- a/weed/topology/allocate_volume.go
+++ b/weed/topology/allocate_volume.go
@@ -3,9 +3,9 @@ package topology
import (
"context"
- "github.com/chrislusf/seaweedfs/weed/operation"
- "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/operation"
+ "github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
"google.golang.org/grpc"
)
@@ -18,11 +18,12 @@ func AllocateVolume(dn *DataNode, grpcDialOption grpc.DialOption, vid needle.Vol
return operation.WithVolumeServerClient(dn.Url(), grpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
_, deleteErr := client.AllocateVolume(context.Background(), &volume_server_pb.AllocateVolumeRequest{
- VolumeId: uint32(vid),
- Collection: option.Collection,
- Replication: option.ReplicaPlacement.String(),
- Ttl: option.Ttl.String(),
- Preallocate: option.Prealloacte,
+ VolumeId: uint32(vid),
+ Collection: option.Collection,
+ Replication: option.ReplicaPlacement.String(),
+ Ttl: option.Ttl.String(),
+ Preallocate: option.Prealloacte,
+ MemoryMapMaxSizeMB: option.MemoryMapMaxSizeMB,
})
return deleteErr
})
diff --git a/weed/topology/cluster_commands.go b/weed/topology/cluster_commands.go
index 152691ccb..a5843d0e5 100644
--- a/weed/topology/cluster_commands.go
+++ b/weed/topology/cluster_commands.go
@@ -2,8 +2,8 @@ package topology
import (
"github.com/chrislusf/raft"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
)
type MaxVolumeIdCommand struct {
diff --git a/weed/topology/collection.go b/weed/topology/collection.go
index f6b728ec9..c4fd3af61 100644
--- a/weed/topology/collection.go
+++ b/weed/topology/collection.go
@@ -3,9 +3,9 @@ package topology
import (
"fmt"
- "github.com/chrislusf/seaweedfs/weed/storage"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
- "github.com/chrislusf/seaweedfs/weed/util"
+ "github.com/joeslay/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/util"
)
type Collection struct {
diff --git a/weed/topology/data_center.go b/weed/topology/data_center.go
index 640cb1937..b419070f8 100644
--- a/weed/topology/data_center.go
+++ b/weed/topology/data_center.go
@@ -1,6 +1,6 @@
package topology
-import "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
+import "github.com/joeslay/seaweedfs/weed/pb/master_pb"
type DataCenter struct {
NodeImpl
diff --git a/weed/topology/data_node.go b/weed/topology/data_node.go
index 3e72ccdbf..83e58e075 100644
--- a/weed/topology/data_node.go
+++ b/weed/topology/data_node.go
@@ -4,14 +4,14 @@ import (
"fmt"
"sync"
- "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
- "github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/pb/master_pb"
+ "github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
"strconv"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/storage"
)
type DataNode struct {
diff --git a/weed/topology/data_node_ec.go b/weed/topology/data_node_ec.go
index 75c8784fe..404ce7c7b 100644
--- a/weed/topology/data_node_ec.go
+++ b/weed/topology/data_node_ec.go
@@ -1,8 +1,8 @@
package topology
import (
- "github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
)
func (dn *DataNode) GetEcShards() (ret []*erasure_coding.EcVolumeInfo) {
diff --git a/weed/topology/node.go b/weed/topology/node.go
index b2808f589..cfa6bebc4 100644
--- a/weed/topology/node.go
+++ b/weed/topology/node.go
@@ -7,9 +7,9 @@ import (
"sync"
"sync/atomic"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
)
type NodeId string
diff --git a/weed/topology/rack.go b/weed/topology/rack.go
index 932c1a804..9926dbbff 100644
--- a/weed/topology/rack.go
+++ b/weed/topology/rack.go
@@ -1,7 +1,7 @@
package topology
import (
- "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
+ "github.com/joeslay/seaweedfs/weed/pb/master_pb"
"strconv"
"time"
)
diff --git a/weed/topology/store_replicate.go b/weed/topology/store_replicate.go
index d21c4d210..e3f3b445e 100644
--- a/weed/topology/store_replicate.go
+++ b/weed/topology/store_replicate.go
@@ -10,12 +10,12 @@ import (
"strconv"
"strings"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/operation"
- "github.com/chrislusf/seaweedfs/weed/security"
- "github.com/chrislusf/seaweedfs/weed/storage"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
- "github.com/chrislusf/seaweedfs/weed/util"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/operation"
+ "github.com/joeslay/seaweedfs/weed/security"
+ "github.com/joeslay/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/util"
)
func ReplicatedWrite(masterNode string, s *storage.Store,
diff --git a/weed/topology/topology.go b/weed/topology/topology.go
index eff8c99a0..48b8080b7 100644
--- a/weed/topology/topology.go
+++ b/weed/topology/topology.go
@@ -7,12 +7,12 @@ import (
"sync"
"github.com/chrislusf/raft"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
- "github.com/chrislusf/seaweedfs/weed/sequence"
- "github.com/chrislusf/seaweedfs/weed/storage"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
- "github.com/chrislusf/seaweedfs/weed/util"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/pb/master_pb"
+ "github.com/joeslay/seaweedfs/weed/sequence"
+ "github.com/joeslay/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/util"
)
type Topology struct {
diff --git a/weed/topology/topology_ec.go b/weed/topology/topology_ec.go
index 93b39bb5d..91330f00f 100644
--- a/weed/topology/topology_ec.go
+++ b/weed/topology/topology_ec.go
@@ -1,10 +1,10 @@
package topology
import (
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
- "github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/pb/master_pb"
+ "github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
)
type EcShardLocations struct {
diff --git a/weed/topology/topology_event_handling.go b/weed/topology/topology_event_handling.go
index 041351492..c51070a32 100644
--- a/weed/topology/topology_event_handling.go
+++ b/weed/topology/topology_event_handling.go
@@ -5,8 +5,8 @@ import (
"math/rand"
"time"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/storage"
)
func (t *Topology) StartRefreshWritableVolumes(grpcDialOption grpc.DialOption, garbageThreshold float64, preallocate int64) {
diff --git a/weed/topology/topology_map.go b/weed/topology/topology_map.go
index 37a88c9ed..d779bd590 100644
--- a/weed/topology/topology_map.go
+++ b/weed/topology/topology_map.go
@@ -1,6 +1,6 @@
package topology
-import "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
+import "github.com/joeslay/seaweedfs/weed/pb/master_pb"
func (t *Topology) ToMap() interface{} {
m := make(map[string]interface{})
diff --git a/weed/topology/topology_test.go b/weed/topology/topology_test.go
index 8f79ad684..5910c87db 100644
--- a/weed/topology/topology_test.go
+++ b/weed/topology/topology_test.go
@@ -1,10 +1,10 @@
package topology
import (
- "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
- "github.com/chrislusf/seaweedfs/weed/sequence"
- "github.com/chrislusf/seaweedfs/weed/storage"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/pb/master_pb"
+ "github.com/joeslay/seaweedfs/weed/sequence"
+ "github.com/joeslay/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
"testing"
)
diff --git a/weed/topology/topology_vacuum.go b/weed/topology/topology_vacuum.go
index 37a6a30b9..15b813815 100644
--- a/weed/topology/topology_vacuum.go
+++ b/weed/topology/topology_vacuum.go
@@ -5,12 +5,12 @@ import (
"sync/atomic"
"time"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
"google.golang.org/grpc"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/operation"
- "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/operation"
+ "github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
)
func batchVacuumVolumeCheck(grpcDialOption grpc.DialOption, vl *VolumeLayout, vid needle.VolumeId, locationlist *VolumeLocationList, garbageThreshold float64) bool {
diff --git a/weed/topology/volume_growth.go b/weed/topology/volume_growth.go
index ff02044a1..e4446ade0 100644
--- a/weed/topology/volume_growth.go
+++ b/weed/topology/volume_growth.go
@@ -5,11 +5,11 @@ import (
"math/rand"
"sync"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
"google.golang.org/grpc"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/storage"
)
/*
@@ -21,13 +21,14 @@ This package is created to resolve these replica placement issues:
*/
type VolumeGrowOption struct {
- Collection string
- ReplicaPlacement *storage.ReplicaPlacement
- Ttl *needle.TTL
- Prealloacte int64
- DataCenter string
- Rack string
- DataNode string
+ Collection string
+ ReplicaPlacement *storage.ReplicaPlacement
+ Ttl *needle.TTL
+ Prealloacte int64
+ DataCenter string
+ Rack string
+ DataNode string
+ MemoryMapMaxSizeMB uint32
}
type VolumeGrowth struct {
diff --git a/weed/topology/volume_growth_test.go b/weed/topology/volume_growth_test.go
index 3573365fd..b1573ae00 100644
--- a/weed/topology/volume_growth_test.go
+++ b/weed/topology/volume_growth_test.go
@@ -5,9 +5,9 @@ import (
"fmt"
"testing"
- "github.com/chrislusf/seaweedfs/weed/sequence"
- "github.com/chrislusf/seaweedfs/weed/storage"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/sequence"
+ "github.com/joeslay/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
)
var topologyLayout = `
diff --git a/weed/topology/volume_layout.go b/weed/topology/volume_layout.go
index 799cbca62..b2b1dd49f 100644
--- a/weed/topology/volume_layout.go
+++ b/weed/topology/volume_layout.go
@@ -7,9 +7,9 @@ import (
"sync"
"time"
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/storage"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/glog"
+ "github.com/joeslay/seaweedfs/weed/storage"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
)
// mapping from volume to its locations, inverted from server to volume
diff --git a/weed/topology/volume_location_list.go b/weed/topology/volume_location_list.go
index 8905c54b5..8fddc1912 100644
--- a/weed/topology/volume_location_list.go
+++ b/weed/topology/volume_location_list.go
@@ -3,7 +3,7 @@ package topology
import (
"fmt"
- "github.com/chrislusf/seaweedfs/weed/storage/needle"
+ "github.com/joeslay/seaweedfs/weed/storage/needle"
)
type VolumeLocationList struct {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-24 18:40:55 +0000