Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not require specifying quota when specifying location watermarks #405

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Do not require specifying quota when specifying location watermarks #405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff74061
Do not require specifying quota for location watermarks
p4vook Dec 18, 2024
37eb852
move TTL out of the if
p4vook Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/ytconfig/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ func getDataNodeServerCarcass(spec *ytv1.DataNodesSpec) (DataNodeServer, error)
}
if quota != nil {
storeLocation.Quota = *quota

}
if location.LowWatermark != nil || quota != nil {
if location.LowWatermark != nil {
storeLocation.LowWatermark = location.LowWatermark.Value()
} else {
Expand All @@ -337,8 +338,8 @@ func getDataNodeServerCarcass(spec *ytv1.DataNodesSpec) (DataNodeServer, error)
storeLocation.HighWatermark = storeLocation.LowWatermark / 2
storeLocation.DisableWritesWatermark = storeLocation.HighWatermark / 2
storeLocation.TrashCleanupWatermark = storeLocation.LowWatermark
storeLocation.MaxTrashTtl = location.MaxTrashMilliseconds
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks a bit hard to understand and error-prone with all these nested ifs.
I suggest we rewrite it in less nested way:

// setting quota
if quota != nil {
    storeLocation.Quota = *quota
}

// setting low watermark
if location.LowWatermark != nil {
    storeLocation.LowWatermark = location.LowWatermark.Value()
} else if quota != nil {
    gb := float64(1024 * 1024 * 1024)
    storeLocation.LowWatermark = int64(math.Min(0.1*float64(storeLocation.Quota), float64(25)*gb))
}

// setting other watermarks if low watermark is set
if storeLocation.LowWatermark > 0 {
    storeLocation.HighWatermark = storeLocation.LowWatermark / 2
    storeLocation.DisableWritesWatermark = storeLocation.HighWatermark / 2
    storeLocation.TrashCleanupWatermark = storeLocation.LowWatermark
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I suggest to add test cases for scenarios which aren't currently covered, so this code won't become broken in the next changes.
Tests for config generator are rather easy to write: just add some test cases with specs having quota=nil + low_watermark=nil, quota!=nil + low_watermark=nil, quota=nil + low_watermark!=nil
and simply check that canonized result looks as expected in config.

storeLocation.MaxTrashTtl = location.MaxTrashMilliseconds
c.DataNode.StoreLocations = append(c.DataNode.StoreLocations, storeLocation)
}

Expand Down