aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--k8s/charts/seaweedfs/templates/filer-statefulset.yaml4
-rw-r--r--k8s/charts/seaweedfs/templates/master-statefulset.yaml4
-rw-r--r--weed/mount/inode_to_path.go6
-rw-r--r--weed/mount/weedfs.go23
-rw-r--r--weed/mount/weedfs_file_sync.go6
-rw-r--r--weed/server/master_grpc_server.go9
6 files changed, 38 insertions, 14 deletions
diff --git a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml b/k8s/charts/seaweedfs/templates/filer-statefulset.yaml
index 77457be74..ae2a25ec8 100644
--- a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml
+++ b/k8s/charts/seaweedfs/templates/filer-statefulset.yaml
@@ -129,7 +129,7 @@ spec:
- "-ec"
- |
exec /usr/bin/weed \
- {{- if or (eq .Values.filer.logs.type "hostPath") (eq .Values.filer.logs.type "emptyDir") }}
+ {{- if or (eq .Values.filer.logs.type "hostPath") (eq .Values.filer.logs.type "persistentVolumeClaim") (eq .Values.filer.logs.type "emptyDir") }}
-logdir=/logs \
{{- else }}
-logtostderr=true \
@@ -197,7 +197,7 @@ spec:
{{- end }}
-master={{ if .Values.global.masterServer }}{{.Values.global.masterServer}}{{ else }}{{ range $index := until (.Values.master.replicas | int) }}${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }}{{ if lt $index (sub ($.Values.master.replicas | int) 1) }},{{ end }}{{ end }}{{ end }}
volumeMounts:
- {{- if or (eq .Values.filer.logs.type "hostPath") (eq .Values.filer.logs.type "emptyDir") }}
+ {{- if (or (eq .Values.filer.logs.type "hostPath") (eq .Values.filer.logs.type "persistentVolumeClaim") (eq .Values.filer.logs.type "emptyDir")) }}
- name: seaweedfs-filer-log-volume
mountPath: "/logs/"
{{- end }}
diff --git a/k8s/charts/seaweedfs/templates/master-statefulset.yaml b/k8s/charts/seaweedfs/templates/master-statefulset.yaml
index 00fb6f913..2fe476fa4 100644
--- a/k8s/charts/seaweedfs/templates/master-statefulset.yaml
+++ b/k8s/charts/seaweedfs/templates/master-statefulset.yaml
@@ -110,7 +110,7 @@ spec:
- "-ec"
- |
exec /usr/bin/weed \
- {{- if or (eq .Values.master.logs.type "hostPath") (eq .Values.master.logs.type "emptyDir") }}
+ {{- if or (eq .Values.master.logs.type "hostPath") (eq .Values.master.logs.type "persistentVolumeClaim") (eq .Values.master.logs.type "emptyDir") }}
-logdir=/logs \
{{- else }}
-logtostderr=true \
@@ -158,7 +158,7 @@ spec:
volumeMounts:
- name : data-{{ .Release.Namespace }}
mountPath: /data
- {{- if or (eq .Values.master.logs.type "hostPath") (eq .Values.master.logs.type "emptyDir") }}
+ {{- if or (eq .Values.master.logs.type "hostPath") (eq .Values.master.logs.type "persistentVolumeClaim") (eq .Values.master.logs.type "emptyDir") }}
- name: seaweedfs-master-log-volume
mountPath: "/logs/"
{{- end }}
diff --git a/weed/mount/inode_to_path.go b/weed/mount/inode_to_path.go
index 2c0b7203e..9992f1c22 100644
--- a/weed/mount/inode_to_path.go
+++ b/weed/mount/inode_to_path.go
@@ -114,9 +114,9 @@ func (i *InodeToPath) AllocateInode(path util.FullPath, unixTime int64) uint64 {
return inode
}
-func (i *InodeToPath) GetInode(path util.FullPath) uint64 {
+func (i *InodeToPath) GetInode(path util.FullPath) (uint64, bool) {
if path == "/" {
- return 1
+ return 1, true
}
i.Lock()
defer i.Unlock()
@@ -125,7 +125,7 @@ func (i *InodeToPath) GetInode(path util.FullPath) uint64 {
// glog.Fatalf("GetInode unknown inode for %s", path)
// this could be the parent for mount point
}
- return inode
+ return inode, found
}
func (i *InodeToPath) GetPath(inode uint64) (util.FullPath, fuse.Status) {
diff --git a/weed/mount/weedfs.go b/weed/mount/weedfs.go
index de7502688..c5a1d2755 100644
--- a/weed/mount/weedfs.go
+++ b/weed/mount/weedfs.go
@@ -105,6 +105,29 @@ func NewSeaweedFileSystem(option *Option) *WFS {
}, func(path util.FullPath) bool {
return wfs.inodeToPath.IsChildrenCached(path)
}, func(filePath util.FullPath, entry *filer_pb.Entry) {
+ // Find inode if it is not a deleted path
+ if inode, inode_found := wfs.inodeToPath.GetInode(filePath); inode_found {
+ // Find open file handle
+ if fh, fh_found := wfs.fhmap.FindFileHandle(inode); fh_found {
+ fhActiveLock := fh.wfs.fhLockTable.AcquireLock("invalidateFunc", fh.fh, util.ExclusiveLock)
+ defer fh.wfs.fhLockTable.ReleaseLock(fh.fh, fhActiveLock)
+
+ fh.entryLock.Lock()
+ defer fh.entryLock.Unlock()
+
+ // Recreate dirty pages
+ fh.dirtyPages.Destroy()
+ fh.dirtyPages = newPageWriter(fh, wfs.option.ChunkSizeLimit)
+
+ // Update handle entry
+ newentry, status := wfs.maybeLoadEntry(filePath)
+ if status == fuse.OK {
+ if fh.GetEntry() != newentry {
+ fh.SetEntry(newentry)
+ }
+ }
+ }
+ }
})
grace.OnInterrupt(func() {
wfs.metaCache.Shutdown()
diff --git a/weed/mount/weedfs_file_sync.go b/weed/mount/weedfs_file_sync.go
index 74e16d43f..762a9b8de 100644
--- a/weed/mount/weedfs_file_sync.go
+++ b/weed/mount/weedfs_file_sync.go
@@ -104,9 +104,6 @@ func (wfs *WFS) doFlush(fh *FileHandle, uid, gid uint32) fuse.Status {
}
}
- fhActiveLock := fh.wfs.fhLockTable.AcquireLock("doFlush", fh.fh, util.ExclusiveLock)
- defer fh.wfs.fhLockTable.ReleaseLock(fh.fh, fhActiveLock)
-
if !fh.dirtyMetadata {
return fuse.OK
}
@@ -115,6 +112,9 @@ func (wfs *WFS) doFlush(fh *FileHandle, uid, gid uint32) fuse.Status {
return fuse.Status(syscall.ENOSPC)
}
+ fhActiveLock := fh.wfs.fhLockTable.AcquireLock("doFlush", fh.fh, util.ExclusiveLock)
+ defer fh.wfs.fhLockTable.ReleaseLock(fh.fh, fhActiveLock)
+
err := wfs.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
fh.entryLock.Lock()
defer fh.entryLock.Unlock()
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go
index 91f69fef4..0a7bd5ef2 100644
--- a/weed/server/master_grpc_server.go
+++ b/weed/server/master_grpc_server.go
@@ -361,8 +361,7 @@ func (ms *MasterServer) addClient(filerGroup, clientType string, clientAddress p
// the KeepConnected loop is no longer listening on this channel but we're
// trying to send to it in SendHeartbeat and so we can't lock the
// clientChansLock to remove the channel and we're stuck writing to it
- // 100 is probably overkill
- messageChan = make(chan *master_pb.KeepConnectedResponse, 100)
+ messageChan = make(chan *master_pb.KeepConnectedResponse, 10000)
ms.clientChansLock.Lock()
ms.clientChans[clientName] = messageChan
@@ -374,8 +373,10 @@ func (ms *MasterServer) deleteClient(clientName string) {
glog.V(0).Infof("- client %v", clientName)
ms.clientChansLock.Lock()
// close message chan, so that the KeepConnected go routine can exit
- close(ms.clientChans[clientName])
- delete(ms.clientChans, clientName)
+ if clientChan, ok := ms.clientChans[clientName]; ok {
+ close(clientChan)
+ delete(ms.clientChans, clientName)
+ }
ms.clientChansLock.Unlock()
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-23 07:38:23 +0000