adoroszlai commented on PR #5625:
URL: https://github.com/apache/ozone/pull/5625#issuecomment-1820329645

   > I'm not sure why the CI build-branch fails. It works on my laptop and I 
can't eyeball any problem with the code.
   
   "This branch is [3 commits 
ahead](https://github.com/duongkame/ozone/compare/apache:ozone:master...HDDS-9709),
 [33 commits 
behind](https://github.com/duongkame/ozone/compare/HDDS-9709...apache:ozone:master)
 `apache:master`."
   
   Github doesn't show conflict, but that only means same areas of code were 
not changed in the two branches.  E.g. if one branch adds a new abstract 
method, and other branch adds a new subclass to the same abstract parent class, 
there will be no code conflict, but compilation will fail.
   
   In this case I have replaced (15c77c6e9bb22a0bbf5d0080f81c9310051229a9) 
`static long testContainerId` with `static final AtomicLong CONTAINER_ID` to 
fix SpotBugs warnings previously suppressed.  The PR is adding a new test 
method which uses `testContainerId`.  This is fine locally, since the branch is 
behind, but it would fail if the PR was merged into current `master`.
   
   PR workflow 
[builds](https://github.com/apache/ozone/actions/runs/6938142340/job/18873425543?pr=5625#step:2:491)
 and tests a hypothetical merge commit to detect such problems (at the time of 
the latest commit in the PR):
   
   > HEAD is now at 0167f66 Merge 3bfa0906a3629fbeba59e278039855406772e850 into 
945e8bfdcfe0be1fecbca3716d41305c4ae23d00
   
   Solved by merging from `master` locally and fixing compile errors.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to