Getting an overview of the differences in master and next - the token changes
This is an attempt to understand if the relevant token changes are applied to the next branch.
More importantly that the token revert changes in d3731259 are not actually reverted in next. This revert MR was !1425 (merged)
The reason for the confusion/error is that !1417 (merged) (to master) needed to be reverted. This corresponds to !1418 (merged) to the next branch. Are still the token fixes in !1418 (merged) actually still present in the next branch? Or were they reverted as a consequence of inheriting the revert MR !1425 (merged) from master?
The reason why the token changes were reverted were because the code was not compatible with older compilers. And our policy is to support older compilers in ARC 6, but move to new compilers in ARC 7. As the token support is mostly important for ARC 7, this is an acceptable choice.
The question is: is this revert also applied to next? If the following token code changes are based on master, this revert MR will automatically also be applied to the next branch. Since it is present in the parent master branch.
It might mean that we have to apply the token fixes again to next, to make sure they are indeed included.
Information about the next branch: The current next branch is a renamed version of the dev-controldir branch.
The differences in the two branches is obtained by:
git checkout master
git log --oneline > master.log
git checkout next
git log --oneline > next.log
diff master.log next.log
The current differences are:
maikenp:arc$ diff master.log next.log
1c1
< 348ffc0eb Merge branch 'dev-monitorglue2reviewp3' into 'master'
---
> 0a0c9e3da Merge branch 'dev-monitorglue2reviewp3' into 'next'
3a4
> 252dcabdf Merge branch 'dev-monitorglue2reviewp2' into 'next'
5a7
> bbff1fd22 Merge branch 'dev-github-pr17' into 'next'
8a11
> bdb22ff1d Merge branch 'ruciotraces' into 'next'
10a14
> 561694737 Merge branch 'bugz-4070' into 'next'
22a27
> cc492a3f1 Merge branch 'master' into dev-controldir
23a29,31
> 3f2147c48 add header for gethostname
> 1fab856f8 rucio no longer only for ATLAS
> c935dbbf2 implement Finalise() method and use it to send Rucio traces
29a38
> 7c174135e make sure new finalise replica states are treated everywhere
30a40
> d1aad66af add replica finalising state
35a46
> 962ea5847 Merge branch 'master' into dev-controldir
36a48
> b60db7436 Merge branch 'master' into dev-controldir
115a128,130
> 216ee6eb2 Disabling SURM Python backend tests because that backend is not ported yet.
> 44fa7088b Fix lrms tests.
> a9d78b540 Merge branch 'master' into dev-controldir
406a422
> 9027f041b Attempt to improve scan performance. Preliminary tests with this solution seems to be some 10% faster
409a426,428
> 863f368eb modified scan-SLURM-job.in to return just the jobid found in processing instead of the full absolute path
> 5148fe07e moved helper function control_path from submit_common.sh to lrms_common.sh.in
> 3ede293ac changing some warnings in XML writer to debug. Maybe be removed after testing
410a430
> 6d2ab2b06 Merge branch 'master' into dev-controldir
418a439,440
> d2426eb72 Post-merge fix
> e0e5ae674 Merge branch 'master' into dev-controldir
483a506
> 40e795871 Merge branch 'master' into dev-controldir
578a602,603
> 906fa8b0b Merge branch 'master' into dev-controldir
> 6a8bad1a7 More LRMS changes.
1096a1122
> 570c8a793 Merge branch 'master' into dev-controldir
1262a1289
> 0145c293d Merge branch 'master' into dev-controldir
1361a1389,1390
> 72619d516 Post-merge fix - use dedicated function for accessing control file.
> c1db86342 Merge branch 'master' into fragmented_control_dir
1371a1401,1411
> 3a170da04 Change gm-kick to accept control dir as argument.
> 033095d0e Adjust lrms backend to changes in control dir layout (untested).
> 0b35c06c5 Adjust lrms backend to changes in control dir layout (untested).
> a47c0a81f Adjust lrms backend to changes in control dir layout (untested).
> d22948570 Adjust lrms backend to changes in control dir layout (untested).
> db1b1a931 Adjust lrms backend to changes in control dir layout (untested).
> ba3a431cf Adjust lrms backend to changes in control dir layout (untested).
> 2adfc219b Adjust lrms backend to changes in control dir layout.
> a5d7d01bb Adjust lrms backend to changes in control dir layout (untested).
> f1e4c60d3 Adjust lrms backend to changes in control dir layout (untested).
> 23a62a58f Adjust lrms backend to changes in control dir layout (untested).
1380a1421
> 6f877c9dc Convert controldir to new format when starting a-rex.
1381a1423
> bc0bb7afb Merge branch 'master' into fragmented_control_dir
1399a1442
> 2d3b1b72d Adjusting code in gridftp jobplugin to access status file.
1411a1455,1457
> d79c79283 Incomplete changes for support of fragmented controldir in gridftp interface.
> df7be27af Better protection of credentials proxy file.
> 093c1340b Fix suffix definition of status file.
1414a1461
> 9c6e53d61 Make infoprovider handle fragmented control dir. Switching to shorter job id similar to delegation id. Better support in fork backend.
1415a1463
> fcaad7c90 More code to handle fragments in control dir.
1416a1465
> 0211e7478 Adding functions for defining paths inside control dir.
Further checking one of the files where the reverts were applied:
git diff master:src/clients/compute/arcsub.cpp next:src/clients/compute/arcsub.cpp
shows no differences.
Conclusion: the token changes are indeed not present in next as they should be.
I must reapply !1418 (merged) to the next branch to get these fixes in.