HDFS-17639. hasStorageType() allocates array unnecessarily on every call#8316
Open
balodesecurity wants to merge 1 commit intoapache:trunkfrom
Open
HDFS-17639. hasStorageType() allocates array unnecessarily on every call#8316balodesecurity wants to merge 1 commit intoapache:trunkfrom
balodesecurity wants to merge 1 commit intoapache:trunkfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
DatanodeDescriptor.hasStorageType()delegates togetStorageInfos()which:storageMaplockDatanodeStorageInfo[]arrayhasStorageType()then iterates the returned array. This means every call allocates a new array and acquires the lock twice (the second time is reentrant since callers likeinjectStorage()already hold the lock). The same pattern exists ingetStorageTypes().On large clusters with many storages per DataNode,
hasStorageType()is called frequently — during block placement, heartbeat processing, and topology updates — making this allocation and double-lock pattern a measurable source of lock contention and GC pressure.Fix
In both
hasStorageType()andgetStorageTypes(), iteratestorageMap.values()directly under a singlesynchronized (storageMap)block, eliminating the array allocation entirely. Callers that already hold the lock (e.g.injectStorage(),updateStorage()) benefit from Java's reentrant semantics — a single lock acquisition instead of two.Testing
Added
TestDatanodeDescriptor#testHasStorageTypeAndGetStorageTypes:DatanodeDescriptorand verifies no type is present before any storage is injectedhasStorageType(DISK)returns true andhasStorageType(SSD)returns falsehasStorageType()andgetStorageTypes()