mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-07-25 09:32:45 +00:00
Chris LuandGitHub
564803becd
* regenerate master_grpc.pb.go with protoc-gen-go-grpc v1.6.2 The other generated pb files are already on v1.6.2; this one was stale. * shell: keep unlock from racing the lease renewal A renewal RPC in flight while ReleaseLock runs re-creates the lock on the master after the release deletes it, and can blank the client name if the renewal reads it mid-release. The stale-token release is then ignored, so the lock stays held (sometimes anonymously) until it expires. Serialize the renew and release RPCs, and set the client name before flipping isLocked so the renewal never sends a partial acquisition. * shell: restart lease renewal after a failed renewal The renewal goroutine exits on error but never cleared its running flag, so later locks in the same process were never renewed and silently expired after ten seconds. * shell: show who holds the cluster lock A blocked lock command gave no hint that another client holds the lock (the refusals only surfaced at -v=2), and cluster.status reported the shell's own lock state as if it were the cluster's. Add a GetAdminLockStatus RPC to the master so lock prints the holder before blocking and cluster.status shows the actual cluster-wide holder. Both degrade silently against masters without the RPC. * shell: bound admin lock RPC attempts with timeouts The lease, renew, release, and holder-status calls all ran without a deadline, so an unresponsive master could hang the renewal goroutine, an unlock (which now waits on the renewal mutex), or the shell prompt. Give each attempt its own short context; the retry loops still resolve a fresh leader on the next try. * master: reject admin token release on non-leaders A follower holds no lock state, so it answered a release with success while the leader kept the lock until expiry. Refuse like LeaseAdminToken does so the client can try the leader instead. * shell: leave the lock release call unbounded A release cut short by a deadline leaves the lock held on the master until it expires, so a slow master would turn every unlock into a ten-second ghost lock. Restore the single fire-and-forget attempt; the timeouts stay on the lease and renew paths, where a stalled call forfeits the lease anyway. * shell: release only the token unlock started with A RequestLock racing a slow release (the admin presence lock does this on shutdown) could have its freshly acquired token sent in the release request or zeroed by the trailing stores. Capture the token once under the mutex and compare on clear so a concurrent acquisition survives an in-flight unlock.
307 lines
8.5 KiB
Go
307 lines
8.5 KiB
Go
package shell
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
)
|
|
|
|
func TestPrintClusterInfo(t *testing.T) {
|
|
testCases := []struct {
|
|
topology *master_pb.TopologyInfo
|
|
humanize bool
|
|
lockHeld bool
|
|
lockHolder string
|
|
lockMessage string
|
|
want string
|
|
}{
|
|
{
|
|
testTopology1, true, false, "", "",
|
|
`cluster:
|
|
id: test_topo_1
|
|
status: unlocked
|
|
nodes: 5
|
|
topology: 5 DCs, 5 disks on 6 racks
|
|
|
|
`,
|
|
},
|
|
{
|
|
testTopology1, false, false, "", "",
|
|
`cluster:
|
|
id: test_topo_1
|
|
status: unlocked
|
|
nodes: 5
|
|
topology: 5 DC(s), 5 disk(s) on 6 rack(s)
|
|
|
|
`,
|
|
},
|
|
{
|
|
testTopology1, true, true, "192.168.1.5", "",
|
|
`cluster:
|
|
id: test_topo_1
|
|
status: LOCKED by 192.168.1.5
|
|
nodes: 5
|
|
topology: 5 DCs, 5 disks on 6 racks
|
|
|
|
`,
|
|
},
|
|
{
|
|
testTopology1, true, true, "192.168.1.5", "ec.encode",
|
|
`cluster:
|
|
id: test_topo_1
|
|
status: LOCKED by 192.168.1.5 (ec.encode)
|
|
nodes: 5
|
|
topology: 5 DCs, 5 disks on 6 racks
|
|
|
|
`,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
var buf bytes.Buffer
|
|
sp := &ClusterStatusPrinter{
|
|
writer: &buf,
|
|
humanize: tc.humanize,
|
|
topology: tc.topology,
|
|
lockHeld: tc.lockHeld,
|
|
lockHolder: tc.lockHolder,
|
|
lockMessage: tc.lockMessage,
|
|
}
|
|
sp.printClusterInfo()
|
|
got := buf.String()
|
|
|
|
if got != tc.want {
|
|
t.Errorf("for %v: got %v, want %v", tc.topology.Id, got, tc.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestPrintClusterInfo_multiDiskPerNode covers a node whose several physical
|
|
// disks of the same type collapse into a single DiskInfo on the wire (keyed by
|
|
// disk type), so counting len(DiskInfos) under-reports the physical disk count.
|
|
// Three nodes with six disks each must report 18 disks, not 3.
|
|
func TestPrintClusterInfo_multiDiskPerNode(t *testing.T) {
|
|
makeNode := func(id string) *master_pb.DataNodeInfo {
|
|
var ecShardInfos []*master_pb.VolumeEcShardInformationMessage
|
|
// One EC volume per physical disk, each carrying its own DiskId 0..5.
|
|
for diskId := uint32(0); diskId < 6; diskId++ {
|
|
ecShardInfos = append(ecShardInfos, &master_pb.VolumeEcShardInformationMessage{
|
|
Id: diskId + 1,
|
|
DiskId: diskId,
|
|
EcIndexBits: 1, // a single shard present
|
|
})
|
|
}
|
|
return &master_pb.DataNodeInfo{
|
|
Id: id,
|
|
DiskInfos: map[string]*master_pb.DiskInfo{
|
|
"": {
|
|
Type: "",
|
|
MaxVolumeCount: 60,
|
|
EcShardInfos: ecShardInfos,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
topo := &master_pb.TopologyInfo{
|
|
Id: "multi_disk_topo",
|
|
DataCenterInfos: []*master_pb.DataCenterInfo{{
|
|
Id: "dc1",
|
|
RackInfos: []*master_pb.RackInfo{{
|
|
Id: "rack1",
|
|
DataNodeInfos: []*master_pb.DataNodeInfo{
|
|
makeNode("node1"), makeNode("node2"), makeNode("node3"),
|
|
},
|
|
}},
|
|
}},
|
|
}
|
|
|
|
var buf bytes.Buffer
|
|
sp := &ClusterStatusPrinter{
|
|
writer: &buf,
|
|
humanize: true,
|
|
topology: topo,
|
|
}
|
|
sp.printClusterInfo()
|
|
got := buf.String()
|
|
want := `cluster:
|
|
id: multi_disk_topo
|
|
status: unlocked
|
|
nodes: 3
|
|
topology: 1 DC, 18 disks on 1 rack
|
|
|
|
`
|
|
if got != want {
|
|
t.Errorf("multi-disk cluster info:\ngot:\n%s\nwant:\n%s", got, want)
|
|
}
|
|
}
|
|
|
|
func TestPrintVolumeInfo(t *testing.T) {
|
|
testCases := []struct {
|
|
topology *master_pb.TopologyInfo
|
|
humanize bool
|
|
want string
|
|
}{
|
|
{
|
|
testTopology2, true,
|
|
`volumes:
|
|
total: 12,056 volumes, 0 collections
|
|
max size: 0 B
|
|
regular: 5,302/25,063 volumes on 15,900 replicas, 15,900 writable (100%), 0 read-only (0%)
|
|
EC: 6,754 EC volumes on 91,662 shards (13.57 shards/volume)
|
|
|
|
`,
|
|
},
|
|
{
|
|
testTopology2, false,
|
|
`volumes:
|
|
total: 12056 volume(s), 0 collection(s)
|
|
max size: 0 byte(s)
|
|
regular: 5302/25063 volume(s) on 15900 replica(s), 15900 writable (100.00%), 0 read-only (0.00%)
|
|
EC: 6754 EC volume(s) on 91662 shard(s) (13.57 shards/volume)
|
|
|
|
`,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
var buf bytes.Buffer
|
|
sp := &ClusterStatusPrinter{
|
|
writer: &buf,
|
|
humanize: tc.humanize,
|
|
topology: tc.topology,
|
|
}
|
|
sp.printVolumeInfo()
|
|
got := buf.String()
|
|
|
|
if got != tc.want {
|
|
t.Errorf("for %v: got %v, want %v", tc.topology.Id, got, tc.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPrintStorageInfo(t *testing.T) {
|
|
testCases := []struct {
|
|
topology *master_pb.TopologyInfo
|
|
humanize bool
|
|
want string
|
|
}{
|
|
{
|
|
testTopology2, true,
|
|
`storage:
|
|
total: 5.9 TB (18 TB raw, 299.97%)
|
|
regular volumes: 5.9 TB (18 TB raw, 299.97%)
|
|
EC volumes: 0 B (0 B raw, 0%)
|
|
|
|
`,
|
|
},
|
|
{
|
|
testTopology2, false,
|
|
`storage:
|
|
total: 5892610895448 byte(s) (17676186754616 byte(s) raw, 299.97%)
|
|
regular volumes: 5892610895448 byte(s) (17676186754616 byte(s) raw, 299.97%)
|
|
EC volumes: 0 byte(s) (0 byte(s) raw, 0.00%)
|
|
|
|
`,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
var buf bytes.Buffer
|
|
sp := &ClusterStatusPrinter{
|
|
writer: &buf,
|
|
humanize: tc.humanize,
|
|
topology: tc.topology,
|
|
}
|
|
sp.printStorageInfo()
|
|
got := buf.String()
|
|
|
|
if got != tc.want {
|
|
t.Errorf("for %v: got %v, want %v", tc.topology.Id, got, tc.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPrintFilesInfo(t *testing.T) {
|
|
testCases := []struct {
|
|
regularVolumesStats RegularVolumesStats
|
|
ecVolumesStats EcVolumesStats
|
|
humanize bool
|
|
want string
|
|
}{
|
|
{
|
|
regularVolumesStats: RegularVolumesStats{
|
|
1: []*VolumeReplicaStats{
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9001", VolumeId: 1, Files: 159, FilesDeleted: 8, TotalSize: 89762704},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9002", VolumeId: 1, Files: 159, FilesDeleted: 8, TotalSize: 89762704},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9008", VolumeId: 1, Files: 159, FilesDeleted: 8, TotalSize: 89762704},
|
|
},
|
|
2: []*VolumeReplicaStats{
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9003", VolumeId: 2, Files: 192, FilesDeleted: 21, TotalSize: 93788632},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9004", VolumeId: 2, Files: 192, FilesDeleted: 21, TotalSize: 93788632},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9005", VolumeId: 2, Files: 192, FilesDeleted: 21, TotalSize: 93788632},
|
|
},
|
|
3: []*VolumeReplicaStats{
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9001", VolumeId: 3, Files: 149, FilesDeleted: 0, TotalSize: 81643872},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9006", VolumeId: 3, Files: 149, FilesDeleted: 0, TotalSize: 81643872},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9009", VolumeId: 3, Files: 149, FilesDeleted: 0, TotalSize: 81643872},
|
|
},
|
|
},
|
|
ecVolumesStats: EcVolumesStats{
|
|
10: &EcVolumeStats{VolumeId: 10, Files: 30, FilesDeleted: 0, TotalSize: 34879032},
|
|
11: &EcVolumeStats{VolumeId: 11, Files: 55, FilesDeleted: 5, TotalSize: 55540341},
|
|
},
|
|
humanize: false,
|
|
want: `files:
|
|
total: 585 file(s), 551 readable (94.19%), 34 deleted (5.81%), avg 607888 byte(s) per file
|
|
regular: 500 file(s), 471 readable (94.20%), 29 deleted (5.80%), avg 530390 byte(s) per file
|
|
EC: 85 file(s), 80 readable (94.12%), 5 deleted (5.88%), avg 1063757 byte(s) per file
|
|
|
|
`,
|
|
},
|
|
{
|
|
regularVolumesStats: RegularVolumesStats{
|
|
1: []*VolumeReplicaStats{
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9001", VolumeId: 1, Files: 184, FilesDeleted: 33, TotalSize: 79187475},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9008", VolumeId: 1, Files: 184, FilesDeleted: 33, TotalSize: 79187475},
|
|
},
|
|
2: []*VolumeReplicaStats{
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9004", VolumeId: 2, Files: 245, FilesDeleted: 4, TotalSize: 89501070},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9005", VolumeId: 2, Files: 245, FilesDeleted: 4, TotalSize: 89501070},
|
|
},
|
|
3: []*VolumeReplicaStats{
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9006", VolumeId: 3, Files: 171, FilesDeleted: 12, TotalSize: 124049530},
|
|
&VolumeReplicaStats{Id: "10.200.17.13:9009", VolumeId: 3, Files: 171, FilesDeleted: 12, TotalSize: 124049530},
|
|
},
|
|
},
|
|
ecVolumesStats: EcVolumesStats{
|
|
20: &EcVolumeStats{VolumeId: 20, Files: 22, FilesDeleted: 10, TotalSize: 27328233},
|
|
30: &EcVolumeStats{VolumeId: 30, Files: 16, FilesDeleted: 11, TotalSize: 11193827},
|
|
},
|
|
humanize: true,
|
|
want: `files:
|
|
total: 638 files, 568 readable (89.02%), 70 deleted (10.97%), avg 519 kB per file
|
|
regular: 600 files, 551 readable (91.83%), 49 deleted (8.16%), avg 488 kB per file
|
|
EC: 38 files, 17 readable (44.73%), 21 deleted (55.26%), avg 1.0 MB per file
|
|
|
|
`,
|
|
},
|
|
}
|
|
|
|
for i, tc := range testCases {
|
|
var buf bytes.Buffer
|
|
sp := &ClusterStatusPrinter{
|
|
writer: &buf,
|
|
humanize: tc.humanize,
|
|
regularVolumesStats: tc.regularVolumesStats,
|
|
ecVolumesStats: tc.ecVolumesStats,
|
|
}
|
|
sp.printFilesInfo()
|
|
got := buf.String()
|
|
|
|
if got != tc.want {
|
|
t.Errorf("#%d: got %v, want %v", i, got, tc.want)
|
|
}
|
|
}
|
|
}
|