simplified logic around merging properties

Author: adityadtu5

pkg/scheduler/objects/queue.go

@@ -253,20 +253,18 @@ func (sq *Queue) getProperties() map[string]string {
 	return props
 }
 
-// GetProperties returns a copy of the properties for this queue.
-// Will never return nil; can return an empty map.
-func (sq *Queue) GetProperties() map[string]string {
-	return sq.getProperties()
-}
-
-// MergeProperties merges the parent queue properties with config properties into this queue.
-// Config properties override parent properties. This should be called after ApplyConf during
-// config reload to re-apply inherited properties from the parent.
-// Lock protected.
-func (sq *Queue) MergeProperties(parent, config map[string]string) {
+// ApplyInheritedProperties merges the parent queue's properties with the given config properties
+// into this queue. Config properties override parent properties. This should be called after
+// ApplyConf during config reload to re-apply inherited properties from the parent.
+// Parent properties are fetched before acquiring sq's lock to avoid lock-ordering issues.
+func (sq *Queue) ApplyInheritedProperties(parent *Queue, config map[string]string) {
+	var parentProps map[string]string
+	if parent != nil {
+		parentProps = parent.getProperties()
+	}
 	sq.Lock()
 	defer sq.Unlock()
-	sq.mergeProperties(parent, config)
+	sq.mergeProperties(parentProps, config)
 }
 
 // mergeProperties merges the properties from the parent queue and the config in the set from new queue

pkg/scheduler/partition.go

@@ -246,7 +246,7 @@ func (pc *PartitionContext) updateQueues(config []configs.QueueConfig, parent *o
 				// ApplyConf sets sq.properties to only the queue's own config properties, which
 				// drops any previously inherited values and prevents parent property changes from
 				// propagating to existing child queues on config reload.
-				queue.MergeProperties(parent.GetProperties(), queueConfig.Properties)
+				queue.ApplyInheritedProperties(parent, queueConfig.Properties)
 			}
 		}
 		if err != nil {

pkg/scheduler/partition_test.go

@@ -1460,7 +1460,7 @@ func TestUpdateQueuesInheritedQuotaPreemptionDelay(t *testing.T) {
 
 	leaf := partition.GetQueue("root.parent.leaf")
 	assert.Assert(t, leaf != nil, "leaf queue should exist")
-	assert.Equal(t, leaf.GetProperties()[configs.QuotaPreemptionDelay], "20s",
+	assert.Equal(t, leaf.GetPartitionQueueDAOInfo(false).Properties[configs.QuotaPreemptionDelay], "20s",
 		"leaf should inherit quota.preemption.delay from parent on initial load")
 
 	// config reload: parent changes delay to 30s; leaf should pick up the new value
@@ -1484,7 +1484,7 @@ func TestUpdateQueuesInheritedQuotaPreemptionDelay(t *testing.T) {
 
 	leaf = partition.GetQueue("root.parent.leaf")
 	assert.Assert(t, leaf != nil, "leaf queue should still exist after reload")
-	assert.Equal(t, leaf.GetProperties()[configs.QuotaPreemptionDelay], "30s",
+	assert.Equal(t, leaf.GetPartitionQueueDAOInfo(false).Properties[configs.QuotaPreemptionDelay], "30s",
 		"leaf should inherit updated quota.preemption.delay from parent on config reload")
 	assert.Equal(t, leaf.GetQuotaPreemptionDelay(), 30*time.Second,
 		"leaf's runtime quotaPreemptionDelay should reflect the updated inherited value")