diff options
| author | Chris Lu <chris.lu@gmail.com> | 2025-06-02 23:56:58 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2025-06-02 23:56:58 -0700 |
| commit | b25561d0d7c45a17f0b6bd73b6335dfa2b50b3f7 (patch) | |
| tree | b5135c511efe0268563ce55555ad18186606f446 | |
| parent | 72047317498700d349afa15b370d3ba8e88fa417 (diff) | |
| download | seaweedfs-b25561d0d7c45a17f0b6bd73b6335dfa2b50b3f7.tar.xz seaweedfs-b25561d0d7c45a17f0b6bd73b6335dfa2b50b3f7.zip | |
3.89
| -rw-r--r-- | k8s/charts/seaweedfs/Chart.yaml | 4 | ||||
| -rw-r--r-- | weed/storage/needle_map/compact_map.go | 16 | ||||
| -rw-r--r-- | weed/util/constants.go | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/k8s/charts/seaweedfs/Chart.yaml b/k8s/charts/seaweedfs/Chart.yaml index c58ab5a53..d84175b05 100644 --- a/k8s/charts/seaweedfs/Chart.yaml +++ b/k8s/charts/seaweedfs/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 description: SeaweedFS name: seaweedfs -appVersion: "3.88" +appVersion: "3.89" # Dev note: Trigger a helm chart release by `git tag -a helm-<version>` -version: 4.0.388 +version: 4.0.389 diff --git a/weed/storage/needle_map/compact_map.go b/weed/storage/needle_map/compact_map.go index a1288cadb..f0b174029 100644 --- a/weed/storage/needle_map/compact_map.go +++ b/weed/storage/needle_map/compact_map.go @@ -91,15 +91,19 @@ func (cs *CompactSection) Set(key NeedleId, offset Offset, size Size) (oldOffset oldOffset.OffsetHigher, oldOffset.OffsetLower, oldSize = oldValue.OffsetHigher, oldValue.OffsetLower, oldValue.Size } cs.setOverflowEntry(skey, offset, size) +<<<<<<< Updated upstream return +======= + } else { + // if we maxed out our values bucket, pin its capacity to minimize memory usage + if len(cs.values) == MaxSectionBucketSize { + bucket := make([]SectionalNeedleValue, len(cs.values)) + copy(bucket, cs.values) + cs.values = bucket + } +>>>>>>> Stashed changes } - // if we maxed out our values bucket, pin its capacity to minimize memory usage - if len(cs.values) == MaxSectionBucketSize { - bucket := make([]SectionalNeedleValue, len(cs.values)) - copy(bucket, cs.values) - cs.values = bucket - } return } diff --git a/weed/util/constants.go b/weed/util/constants.go index c92d24f11..a5701c1a4 100644 --- a/weed/util/constants.go +++ b/weed/util/constants.go @@ -8,7 +8,7 @@ const HttpStatusCancelled = 499 var ( MAJOR_VERSION = int32(3) - MINOR_VERSION = int32(88) + MINOR_VERSION = int32(89) VERSION_NUMBER = fmt.Sprintf("%d.%02d", MAJOR_VERSION, MINOR_VERSION) VERSION = sizeLimit + " " + VERSION_NUMBER COMMIT = "" |