HDDS-9816. Addendum: fix compile error due to conflict with HDDS-9303

[adoroszlai]

What changes were proposed in this pull request?

Fix compile error caused by HDDS-9816 and HDDS-9303.

https://issues.apache.org/jira/browse/HDDS-9816

How was this patch tested?

Compiled locally.

[hemantk-12]

Thanks for the quick fix @adoroszlai

[sadanand48]

Thanks for reporting & fixing it, @adoroszlai , @sodonnel .

[adoroszlai]

Thanks @hemantk-12, @sadanand48, @sodonnel for the review.

[adoroszlai]

this change caused compile failure

@ChenSammi it fixed the compile error that was caused by the change mentioned in PR description.

Your PR is still built against the previous commit:

HEAD is now at ecb77b7 Merge 32e628e into fd9bb1e

https://github.com/apache/ozone/actions/runs/7168115694/job/19515934863?pr=5749#step:2:491

To fix it, please merge current master into your branch.

[ChenSammi]

this change caused compile failure

@ChenSammi it fixed the compile error that was caused by the change mentioned in PR description.

Your PR is still built against the previous commit:

HEAD is now at ecb77b7 Merge 32e628e into fd9bb1e

https://github.com/apache/ozone/actions/runs/7168115694/job/19515934863?pr=5749#step:2:491

To fix it, please merge current master into your branch.

Right, @adoroszlai , this patch fixes the compile issue. Just curious, the JIRAs caused compile failure are all recent merged. How does their CI build not find the compile failure?

[hemantk-12]

this change caused compile failure

@ChenSammi it fixed the compile error that was caused by the change mentioned in PR description.
Your PR is still built against the previous commit:

HEAD is now at ecb77b7 Merge 32e628e into fd9bb1e

https://github.com/apache/ozone/actions/runs/7168115694/job/19515934863?pr=5749#step:2:491
To fix it, please merge current master into your branch.

Right, @adoroszlai , this patch fixes the compile issue. Just curious, the JIRAs caused compile failure are all recent merged. How does their CI build not find the compile failure?

I think both commits were fine independently and CI passed on both of them. Compilation failed when both were merged into master branch.

[adoroszlai]

How does their CI build not find the compile failure?

Events:

• last PR build for HDDS-9303: HEAD is now at 8eb8805 Merge 89b1c07 into eb7e8d0
• ... (many commits on master)
• last PR build for HDDS-9816: HEAD is now at a1eec72 Merge 61e2881 into 3c9df5c
• ... (few commits on master)
• HDDS-9303 is merged as dd431cd
• ... (many commits on master)
• HDDS-9816 is merged as 94f539d

Git reports conflict for the second PR if commits on master edit the same lines, but it doesn't know about code syntax/semantics.

If I remember correctly there is an option in Github to only allow PR merge if its branch is up-to-date with the base branch. But that requires more work for both developers and CI.

The current behavior is similar to optimistic locking in DBs. I think it's fine in most cases.