fetch2/gitsm: fix config file concurrent update race
PATCH v2 1/1 fetch2/gitsm: fix config file concurrent update race
From: Ming Liu <[email protected]>
A following issue was observed with gitsm:
| git -c core.fsyncobjectfiles=0 config submodule... failed with exit code 255, output:
| error: could not lock config file config: File exists
Since all git submodules share a config file and Git creates a lock file (.git/config.lock) to synchronize access to it, but Git only tries exactly once and returns a error if it's already locked. This leads to a race condition if there are many 'git config submodule' run in different processes.
It could be fixed by introducing a bitbake file lock to protect config file from concurrent update from submodules.
--- lib/bb/fetch2/gitsm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
lib/bb/fetch2/gitsm.py +12 -4
@@ -183,11 +183,19 @@ class GitSM(Git): local_path = newfetch.localpath(url) - # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + # Protects the config file from concurrent updates by submodules + # e.g. 'git config submodule' run in different processes may lead + # to a race condition. + lf = bb.utils.lockfile(os.path.join(ud.destdir, "gitsm-config.lock")) - if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + try: + # Correct the submodule references to the local download version... + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + + if ud.shallow: + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + finally: + bb.utils.unlockfile(lf) # Ensure the submodule repository is NOT set to bare, since we're checking it out... try:
Signature · 1 line
2.7.4
Quoted 39 lines · On Fri, 2019-01-25 at 15:41 +0100, [email protected] wrote:
From: Ming Liu <[email protected]>
A following issue was observed with gitsm:
Quoted 2 lines
git -c core.fsyncobjectfiles=0 config submodule... failed with exit code 255, output:
error: could not lock config file config: File existsSince all git submodules share a config file and Git creates a lock file (.git/config.lock) to synchronize access to it, but Git only tries exactly once and returns a error if it's already locked. This leads to a race condition if there are many 'git config submodule' run in different processes.
It could be fixed by introducing a bitbake file lock to protect config file from concurrent update from submodules.
Reported-by Stefan Agner <[email protected]>Signed-off-by Ming Liu <[email protected]>--- lib/bb/fetch2/gitsm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)lib/bb/fetch2/gitsm.py +5
-4@@ -183,11 +183,19 @@ class GitSM(Git): local_path = newfetch.localpath(url) - # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + # Protects the config file from concurrent updates by submodules + # e.g. 'git config submodule' run in different processes may lead + # to a race condition. + lf = bb.utils.lockfile(os.path.join(ud.destdir, "gitsm-config.lock")) - if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + try:
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 201
Quoted 10 lines
lib/bb/fetch2/gitsm.py +7
-0+ # Correct the submodule references to the local download version... + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + + if ud.shallow: + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + finally: + bb.utils.unlockfile(lf) # Ensure the submodule repository is NOT set to bare, since we're checking it out... try:
I still don't see why this is necessary after Mark's recent changes. These files are in ud.destdir which in OE terms is WORKDIR. Only one fetch happens against WORKDIR at a time? Therefore how is this racing?
Have you seen this problem against the current master code?
Cheers,
Richard
Quoted 48 lines · Richard Purdie
Quoted 47 lines · On Fri, 2019-01-25 at 15:41 +0100, [email protected] wrote:
From: Ming Liu <[email protected]>
A following issue was observed with gitsm:
Quoted 2 lines
git -c core.fsyncobjectfiles=0 config submodule... failed with exit code 255, output:
error: could not lock config file config: File existsSince all git submodules share a config file and Git creates a lock file (.git/config.lock) to synchronize access to it, but Git only tries exactly once and returns a error if it's already locked. This leads to a race condition if there are many 'git config submodule' run in different processes.
It could be fixed by introducing a bitbake file lock to protect config file from concurrent update from submodules.
Reported-by Stefan Agner <[email protected]>Signed-off-by Ming Liu <[email protected]>--- lib/bb/fetch2/gitsm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)lib/bb/fetch2/gitsm.py +12
-4@@ -183,11 +183,19 @@ class GitSM(Git): local_path = newfetch.localpath(url) - # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + # Protects the config file from concurrent updates by submodules + # e.g. 'git config submodule' run in different processes may lead + # to a race condition. + lf = bb.utils.lockfile(os.path.join(ud.destdir, "gitsm-config.lock")) - if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + try: + # Correct the submodule references to the local download version... + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + + if ud.shallow: + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + finally: + bb.utils.unlockfile(lf)
Quoted 6 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 201
Quoted 2 lines
lib/bb/fetch2/gitsm.py +0
-0# Ensure the submodule repository is NOT set to bare, since we're checking it out... try:I still don't see why this is necessary after Mark's recent changes. These files are in ud.destdir which in OE terms is WORKDIR. Only one fetch happens against WORKDIR at a time? Therefore how is this racing?
The git config race we only observed before the recent changes by Mark.
If those changes have the potential to fix this issue, we should test those first and hold on with this patch.
Quoted 2 lines
Have you seen this problem against the current master code?
Master as of yesterday (or Wednesday) was not able to fetch the project (aktualizr).
Even with the latest 2 fixes I am not able to build the (very same) recipe anymore, it ends up in an error during do_configure, presumably due to missing submodules:
| -- Configuring done | CMake Error at partial/CMakeLists.txt:116 (add_library): | Cannot find source file: |
| extern/isotp-c/deps/bitfield-c/src/bitfield/8byte.c
|
| Tried extensions .c .C .c++ .cc .cpp .cxx .cu .m .M .mm .h .hh .h++
.hm
| .hpp .hxx .in .txx | | | CMake Error at partial/CMakeLists.txt:116 (add_library): | No SOURCES given to target: isotp |
Using c1fcc46e2498 ("bitbake: Fix Deprecated warnings from regexs") works fine.
--
Stefan
Is the repository you are using public? If so, give me the URL and commit ID for the main repository and I'll get it added to the test suite.
(For testing what I've been doing is checking out with raw git and then with the gitsm fetcher.. comparing the difference and then adding those specific things as regressions checks.)
If it's not public, then you'll likely need to do that yourself. Compare the results and try to figure out what the difference is. Once you have that, it may be more obvious what the problems. (Comparison should include the .git contents as well..)
--Mark
Quoted 97 lines · Stefan Agner
Quoted 48 lines · Richard Purdie
Quoted 47 lines · On Fri, 2019-01-25 at 15:41 +0100, [email protected] wrote:
From: Ming Liu <[email protected]>
A following issue was observed with gitsm:
Quoted 2 lines
git -c core.fsyncobjectfiles=0 config submodule... failed with exit code 255, output:
error: could not lock config file config: File existsSince all git submodules share a config file and Git creates a lock file (.git/config.lock) to synchronize access to it, but Git only tries exactly once and returns a error if it's already locked. This leads to a race condition if there are many 'git config submodule' run in different processes.
It could be fixed by introducing a bitbake file lock to protect config file from concurrent update from submodules.
Reported-by Stefan Agner <[email protected]>Signed-off-by Ming Liu <[email protected]>--- lib/bb/fetch2/gitsm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)lib/bb/fetch2/gitsm.py +12
-4@@ -183,11 +183,19 @@ class GitSM(Git): local_path = newfetch.localpath(url) - # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + # Protects the config file from concurrent updates by submodules + # e.g. 'git config submodule' run in different processes may lead + # to a race condition. + lf = bb.utils.lockfile(os.path.join(ud.destdir, "gitsm-config.lock")) - if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + try: + # Correct the submodule references to the local download version... + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + + if ud.shallow: + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + finally: + bb.utils.unlockfile(lf)Quoted 6 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 201
Quoted 2 lines
lib/bb/fetch2/gitsm.py +0
-0# Ensure the submodule repository is NOT set to bare, since we're checking it out... try:I still don't see why this is necessary after Mark's recent changes. These files are in ud.destdir which in OE terms is WORKDIR. Only one fetch happens against WORKDIR at a time? Therefore how is this racing?
The git config race we only observed before the recent changes by Mark.
If those changes have the potential to fix this issue, we should test those first and hold on with this patch.
Quoted 2 lines
Have you seen this problem against the current master code?
Master as of yesterday (or Wednesday) was not able to fetch the project (aktualizr).
Even with the latest 2 fixes I am not able to build the (very same) recipe anymore, it ends up in an error during
do_configure, presumably due to missing submodules:| -- Configuring done | CMake Error at partial/CMakeLists.txt:116 (add_library): | Cannot find source file: ||
extern/isotp-c/deps/bitfield-c/src/bitfield/8byte.c|
| Tried extensions .c .C .c++ .cc .cpp .cxx .cu .m .M .mm .h .hh .h++
.hm| .hpp .hxx .in .txx | | | CMake Error at partial/CMakeLists.txt:116 (add_library): | No SOURCES given to target: isotp |Using
c1fcc46e2498("bitbake: Fix Deprecated warnings from regexs") works fine.--
Stefan
Quoted 2 lines · Mark Hatle
Is the repository you are using public? If so, give me the URL and commit ID for the main repository and I'll get it added to the test suite.
I reread this and went back into the prior info from you. It appears the repository you are talking about is:
gitsm://github.com/advancedtelematic/aktualizr;branch=master
SRCREV = d00d1a04cc2366d1a5f143b84b9f507f8bd32c44
I manually checked this out doing the following:
git clone git://github.com/advancedtelematic/aktualizr
git checkout d00d1a04cc2366d1a5f143b84b9f507f8bd32c44 git submodule init
git submodule update --recursive
I then ran the same thing using the gitsm fetcher. Using:
gitsm://github.com/advancedtelematic/aktualizr;branch=master;protocol=git;rev=d00d1a04cc2366d1a5f143b84b9f507f8bd32c44
Comparing the resulting system, they are nearly identical. All of the checked out sources are -exactly- the same.
There are some minor differences in the .git directory, but none of them affect what is actually checked out.
Output of:
diff -urN 'gitsm version' aktualizr -x .git
is identical
comparing the git directory is slightly different, but all within the expectations.
So I do not see anything that the gitsm fetcher is doing incorrectly at this point.
You should run the same type of comparison and see if you are getting the same results.
BTW I went back to bitbake commit c1fcc46e2498, and repeated the experiment.
This shows that a significant part of was checked out incorrectly.
For instance, the submodule partial/extern/isotp-c:
In the current version is checked out on 4c5904bff3ed83ec471c8586b5faed62898d0224. (Which matches the manual git behavior.)
While the gitsm fetcher in the older system checkedout commit 614fe48fe55aeea98b49804b7e31ef2d304f62de. Which is incorrect.
So it seems to be that something in the recipe was expecting semi-broken behavior.. and its actually a recipe problem.
--Mark
Quoted 110 lines
(For testing what I've been doing is checking out with raw git and then with the gitsm fetcher.. comparing the difference and then adding those specific things as regressions checks.)
If it's not public, then you'll likely need to do that yourself. Compare the results and try to figure out what the difference is. Once you have that, it may be more obvious what the problems. (Comparison should include the .git contents as well..)
--Mark
Quoted 97 lines · Stefan Agner
Quoted 48 lines · Richard Purdie
Quoted 47 lines · On Fri, 2019-01-25 at 15:41 +0100, [email protected] wrote:
From: Ming Liu <[email protected]>
A following issue was observed with gitsm:
Quoted 2 lines
git -c core.fsyncobjectfiles=0 config submodule... failed with exit code 255, output:
error: could not lock config file config: File existsSince all git submodules share a config file and Git creates a lock file (.git/config.lock) to synchronize access to it, but Git only tries exactly once and returns a error if it's already locked. This leads to a race condition if there are many 'git config submodule' run in different processes.
It could be fixed by introducing a bitbake file lock to protect config file from concurrent update from submodules.
Reported-by Stefan Agner <[email protected]>Signed-off-by Ming Liu <[email protected]>--- lib/bb/fetch2/gitsm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)lib/bb/fetch2/gitsm.py +12
-4@@ -183,11 +183,19 @@ class GitSM(Git): local_path = newfetch.localpath(url) - # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + # Protects the config file from concurrent updates by submodules + # e.g. 'git config submodule' run in different processes may lead + # to a race condition. + lf = bb.utils.lockfile(os.path.join(ud.destdir, "gitsm-config.lock")) - if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + try: + # Correct the submodule references to the local download version... + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + + if ud.shallow: + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + finally: + bb.utils.unlockfile(lf)Quoted 6 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 201
Quoted 2 lines
lib/bb/fetch2/gitsm.py +0
-0# Ensure the submodule repository is NOT set to bare, since we're checking it out... try:I still don't see why this is necessary after Mark's recent changes. These files are in ud.destdir which in OE terms is WORKDIR. Only one fetch happens against WORKDIR at a time? Therefore how is this racing?
The git config race we only observed before the recent changes by Mark.
If those changes have the potential to fix this issue, we should test those first and hold on with this patch.
Quoted 2 lines
Have you seen this problem against the current master code?
Master as of yesterday (or Wednesday) was not able to fetch the project (aktualizr).
Even with the latest 2 fixes I am not able to build the (very same) recipe anymore, it ends up in an error during
do_configure, presumably due to missing submodules:| -- Configuring done | CMake Error at partial/CMakeLists.txt:116 (add_library): | Cannot find source file: ||
extern/isotp-c/deps/bitfield-c/src/bitfield/8byte.c|
| Tried extensions .c .C .c++ .cc .cpp .cxx .cu .m .M .mm .h .hh .h++
.hm| .hpp .hxx .in .txx | | | CMake Error at partial/CMakeLists.txt:116 (add_library): | No SOURCES given to target: isotp |Using
c1fcc46e2498("bitbake: Fix Deprecated warnings from regexs") works fine.--
Stefan
[adding Patrick, he is often working on the recipe]
Quoted 8 lines · Mark Hatle
Quoted 2 lines · Mark Hatle
Is the repository you are using public? If so, give me the URL and commit ID for the main repository and I'll get it added to the test suite.
I reread this and went back into the prior info from you. It appears the repository you are talking about is:
gitsm://github.com/advancedtelematic/aktualizr;branch=master
Yes that is the repository.
Quoted 2 lines
SRCREV =
d00d1a04cc2366d1a5f143b84b9f507f8bd32c44
And the hash I was using.
Quoted 41 lines
I manually checked this out doing the following:
git clone
git://github.com/advancedtelematic/aktualizr
git checkoutd00d1a04cc2366d1a5f143b84b9f507f8bd32c44git submodule init
git submodule update --recursiveI then ran the same thing using the gitsm fetcher. Using:
gitsm://github.com/advancedtelematic/aktualizr;branch=master;protocol=git;rev=d00d1a04cc2366d1a5f143b84b9f507f8bd32c44
Comparing the resulting system, they are nearly identical. All of the checked out sources are -exactly- the same.
There are some minor differences in the .git directory, but none of them affect what is actually checked out.
Output of:
diff -urN 'gitsm version' aktualizr -x .git
is identical
comparing the git directory is slightly different, but all within the expectations.
So I do not see anything that the gitsm fetcher is doing incorrectly at this point.
You should run the same type of comparison and see if you are getting the same results.
BTW I went back to bitbake commit
c1fcc46e2498, and repeated the experiment.This shows that a significant part of was checked out incorrectly.
Quoted 9 lines
For instance, the submodule partial/extern/isotp-c:
In the current version is checked out on
4c5904bff3ed83ec471c8586b5faed62898d0224. (Which matches the manual git behavior.)While the gitsm fetcher in the older system checkedout commit
614fe48fe55aeea98b49804b7e31ef2d304f62de. Which is incorrect.
Yeah this would explain the behavior I am seeing.
Quoted 3 lines
So it seems to be that something in the recipe was expecting semi-broken behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Thanks for looking into it and sorry for the noise!
--
Stefan
Quoted 113 lines
--Mark
Quoted 110 lines
(For testing what I've been doing is checking out with raw git and then with the gitsm fetcher.. comparing the difference and then adding those specific things as regressions checks.)
If it's not public, then you'll likely need to do that yourself. Compare the results and try to figure out what the difference is. Once you have that, it may be more obvious what the problems. (Comparison should include the .git contents as well..)
--Mark
Quoted 97 lines · Stefan Agner
Quoted 48 lines · Richard Purdie
Quoted 47 lines · On Fri, 2019-01-25 at 15:41 +0100, [email protected] wrote:
From: Ming Liu <[email protected]>
A following issue was observed with gitsm:
Quoted 2 lines
git -c core.fsyncobjectfiles=0 config submodule... failed with exit code 255, output:
error: could not lock config file config: File existsSince all git submodules share a config file and Git creates a lock file (.git/config.lock) to synchronize access to it, but Git only tries exactly once and returns a error if it's already locked. This leads to a race condition if there are many 'git config submodule' run in different processes.
It could be fixed by introducing a bitbake file lock to protect config file from concurrent update from submodules.
Reported-by Stefan Agner <[email protected]>Signed-off-by Ming Liu <[email protected]>--- lib/bb/fetch2/gitsm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)lib/bb/fetch2/gitsm.py +12
-4@@ -183,11 +183,19 @@ class GitSM(Git): local_path = newfetch.localpath(url) - # Correct the submodule references to the local download version... - runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + # Protects the config file from concurrent updates by submodules + # e.g. 'git config submodule' run in different processes may lead + # to a race condition. + lf = bb.utils.lockfile(os.path.join(ud.destdir, "gitsm-config.lock")) - if ud.shallow: - runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + try: + # Correct the submodule references to the local download version... + runfetchcmd("%(basecmd)s config submodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module': module, 'url' : local_path}, d, workdir=ud.destdir) + + if ud.shallow: + runfetchcmd("%(basecmd)s config submodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module': module}, d, workdir=ud.destdir) + finally: + bb.utils.unlockfile(lf)Quoted 6 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 201
Quoted 2 lines
lib/bb/fetch2/gitsm.py +0
-0# Ensure the submodule repository is NOT set to bare, since we're checking it out... try:I still don't see why this is necessary after Mark's recent changes. These files are in ud.destdir which in OE terms is WORKDIR. Only one fetch happens against WORKDIR at a time? Therefore how is this racing?
The git config race we only observed before the recent changes by Mark.
If those changes have the potential to fix this issue, we should test those first and hold on with this patch.
Quoted 2 lines
Have you seen this problem against the current master code?
Master as of yesterday (or Wednesday) was not able to fetch the project (aktualizr).
Even with the latest 2 fixes I am not able to build the (very same) recipe anymore, it ends up in an error during
do_configure, presumably due to missing submodules:| -- Configuring done | CMake Error at partial/CMakeLists.txt:116 (add_library): | Cannot find source file: ||
extern/isotp-c/deps/bitfield-c/src/bitfield/8byte.c|
| Tried extensions .c .C .c++ .cc .cpp .cxx .cu .m .M .mm .h .hh .h++
.hm| .hpp .hxx .in .txx | | | CMake Error at partial/CMakeLists.txt:116 (add_library): | No SOURCES given to target: isotp |Using
c1fcc46e2498("bitbake: Fix Deprecated warnings from regexs") works fine.--
Stefan
Hi, Mark:
Thanks for the explanation, my understanding was wrong, sorry the noise.
//Ming Liu
Stefan Agner <[email protected]> 於 2019年1月26日 週六 上午11:15寫道:
Quoted 226 lines
[adding Patrick, he is often working on the recipe]
Quoted 2 lines · Mark Hatle
Quoted 1 line · Mark Hatle
Is the repository you are using public? If so, give me the URL and
commit ID
Quoted 6 lines
Quoted 1 line
for the main repository and I'll get it added to the test suite.
I reread this and went back into the prior info from you. It appears the repository you are talking about is:
gitsm://github.com/advancedtelematic/aktualizr;branch=master
Yes that is the repository.
Quoted 2 lines
SRCREV =
d00d1a04cc2366d1a5f143b84b9f507f8bd32c44And the hash I was using.
Quoted 10 lines
I manually checked this out doing the following:
git clone
git://github.com/advancedtelematic/aktualizr
git checkoutd00d1a04cc2366d1a5f143b84b9f507f8bd32c44git submodule init
git submodule update --recursiveQuoted 4 lines
I then ran the same thing using the gitsm fetcher. Using:
gitsm://
github.com/advancedtelematic/aktualizr;branch=master;protocol=git;rev=d00d1a04cc2366d1a5f143b84b9f507f8bd32c44
Quoted 2 lines
Comparing the resulting system, they are nearly identical. All of the
checked
Quoted 3 lines
out sources are -exactly- the same.
There are some minor differences in the .git directory, but none of them
affect
Quoted 8 lines
what is actually checked out.
Output of:
diff -urN 'gitsm version' aktualizr -x .git
is identical
Quoted 7 lines
comparing the git directory is slightly different, but all within the expectations.
So I do not see anything that the gitsm fetcher is doing incorrectly at this point.
You should run the same type of comparison and see if you are getting
the same
Quoted 4 lines
results.
BTW I went back to bitbake commit
c1fcc46e2498, and repeated theexperiment.
Quoted 12 lines
This shows that a significant part of was checked out incorrectly.
For instance, the submodule partial/extern/isotp-c:
In the current version is checked out on
4c5904bff3ed83ec471c8586b5faed62898d0224. (Which matches the manual git behavior.)While the gitsm fetcher in the older system checkedout commit
614fe48fe55aeea98b49804b7e31ef2d304f62de. Which is incorrect.Yeah this would explain the behavior I am seeing.
Quoted 3 lines
So it seems to be that something in the recipe was expecting semi-broken behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Thanks for looking into it and sorry for the noise!
--
StefanQuoted 4 lines
--Mark
Quoted 1 line
(For testing what I've been doing is checking out with raw git and then
with the
Quoted 1 line
Quoted 1 line
gitsm fetcher.. comparing the difference and then adding those specific
things
Quoted 3 lines
Quoted 3 lines
as regressions checks.)
If it's not public, then you'll likely need to do that yourself.
Compare the
Quoted 1 line
Quoted 1 line
results and try to figure out what the difference is. Once you have
that, it
Quoted 1 line
Quoted 1 line
may be more obvious what the problems. (Comparison should include the
.git
Quoted 11 lines
Quoted 11 lines
contents as well..)
--Mark
Quoted 6 lines · Stefan Agner
Quoted 5 lines · Richard Purdie
Quoted 4 lines · On Fri, 2019-01-25 at 15:41 +0100, [email protected] wrote:
From: Ming Liu <[email protected]>
A following issue was observed with gitsm:
Quoted 1 line
git -c core.fsyncobjectfiles=0 config submodule... failed with exit
code 255, output:
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
error: could not lock config file config: File exists
Since all git submodules share a config file and Git creates a lock file (.git/config.lock) to synchronize access to it, but Git only
tries
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
exactly once and returns a error if it's already locked. This leads
to
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
a race condition if there are many 'git config submodule' run in different processes.
It could be fixed by introducing a bitbake file lock to protect
config
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
file from concurrent update from submodules.
Reported-by Stefan Agner <[email protected]>Signed-off-by Ming Liu <[email protected]>--- lib/bb/fetch2/gitsm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)lib/bb/fetch2/gitsm.py +0
-0@@ -183,11 +183,19 @@ class GitSM(Git):Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
lib/bb/fetch2/gitsm.py class GitSM(Git):
Quoted 3 lines
lib/bb/fetch2/gitsm.py +0
-1local_path = newfetch.localpath(url) - # Correct the submodule references to the localdownload version...
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 187
Quoted 1 line
lib/bb/fetch2/gitsm.py +0
-1- runfetchcmd("%(basecmd)s configsubmodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module':
module, 'url' :local_path}, d, workdir=ud.destdir)Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 186
Quoted 1 line
lib/bb/fetch2/gitsm.py +1
-0+ # Protects the config file from concurrent updates bysubmodules
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 187
Quoted 1 line
lib/bb/fetch2/gitsm.py +1
-0+ # e.g. 'git config submodule' run in differentprocesses may lead
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 189
Quoted 2 lines
lib/bb/fetch2/gitsm.py +2
-0+ # to a race condition. + lf = bb.utils.lockfile(os.path.join(ud.destdir,"gitsm-config.lock"))
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 189
Quoted 3 lines
lib/bb/fetch2/gitsm.py +0
-2- if ud.shallow: - runfetchcmd("%(basecmd)s configsubmodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module':
module}, d, workdir=ud.destdir)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 191
Quoted 2 lines
lib/bb/fetch2/gitsm.py +2
-0+ try: + # Correct the submodule references to the localdownload version...
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 192
Quoted 1 line
lib/bb/fetch2/gitsm.py +1
-0+ runfetchcmd("%(basecmd)s configsubmodule.%(module)s.url %(url)s" % {'basecmd': ud.basecmd, 'module':
module, 'url' :local_path}, d, workdir=ud.destdir)Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
lib/bb/fetch2/gitsm.py class GitSM(Git):
Quoted 3 lines
lib/bb/fetch2/gitsm.py +3
-0+ + if ud.shallow: + runfetchcmd("%(basecmd)s configsubmodule.%(module)s.shallow true" % {'basecmd': ud.basecmd, 'module':
module}, d, workdir=ud.destdir)Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
lib/bb/fetch2/gitsm.py class GitSM(Git):
Quoted 4 lines
lib/bb/fetch2/gitsm.py +2
-0+ finally: + bb.utils.unlockfile(lf) # Ensure the submodule repository is NOT set to bare,since we're checking it out...
Quoted 48 lines
Quoted 48 lines
Quoted 47 lines
Quoted 5 lines
lib/bb/fetch2/gitsm.py class GitSM(Git): · line 200
Quoted 1 line
lib/bb/fetch2/gitsm.py +0
-0try:I still don't see why this is necessary after Mark's recent changes. These files are in ud.destdir which in OE terms is WORKDIR. Only one fetch happens against WORKDIR at a time? Therefore how is this racing?
The git config race we only observed before the recent changes by Mark.
If those changes have the potential to fix this issue, we should test those first and hold on with this patch.
Quoted 2 lines
Have you seen this problem against the current master code?
Master as of yesterday (or Wednesday) was not able to fetch the project (aktualizr).
Even with the latest 2 fixes I am not able to build the (very same) recipe anymore, it ends up in an error during
do_configure, presumably due to missing submodules:| -- Configuring done | CMake Error at partial/CMakeLists.txt:116 (add_library): | Cannot find source file: ||
extern/isotp-c/deps/bitfield-c/src/bitfield/8byte.c|
| Tried extensions .c .C .c++ .cc .cpp .cxx .cu .m .M .mm .h .hh .h++
.hm| .hpp .hxx .in .txx | | | CMake Error at partial/CMakeLists.txt:116 (add_library): | No SOURCES given to target: isotp |Using
c1fcc46e2498("bitbake: Fix Deprecated warnings from regexs") works fine.--
Stefan
Quoted 5 lines · Stefan Agner
Quoted 2 lines
So it seems to be that something in the recipe was expecting semi-broken behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Sorry, I must be missing something. What might be wrong with the recipe? Is there more that needs to be specified than a SRCREV and a branch? As far as I understand git, it keeps track of the submodules, so I don't know what other information there would be to provide. The reason this particular case is difficult is because there are recursive submodules. When we build aktualizr, we have to be careful to specify that. See
https://github.com/advancedtelematic/aktualizr#building:
git submodule update --init --recursive
Thanks,
Patrick
Hi, Mark:
I could reproduce the error reported by Stefan, on the tip:
...
commit 8c8ecec2a722bc2885e2648d41ac8df07bdf660d
Author: Mark Hatle <[email protected]> Date: Wed Jan 23 10:28:18 2019 -0500
gitsmy.py: Fix unpack of submodules of submodules
...
seems GitSM does not handle recursive submodules.
in my aktualizr/1.0+gitAUTOINC+d00d1a04cc-7/git/.git/config:
...
[submodule "tests/tuf-test-vectors"]
url =/mnt/oe/downloads/git2/github.com.advancedtelematic.tuf-test-vectors. [submodule "partial/extern/isotp-c"]
url =/mnt/oe/downloads/git2/github.com.advancedtelematic.isotp-c.git [submodule "third_party/HdrHistogram_c"]
url = /mnt/oe/downloads/git2/github.com.HdrHistogram.HdrHistogram_c
[submodule "third_party/googletest"]
url = /mnt/oe/downloads/git2/github.com.google.googletest.git
...
in which, /mnt/oe/downloads/git2/github.com.advancedtelematic.isotp-c.git has its own submodule,
aktualizr/1.0+gitAUTOINC+d00d1a04cc-7/git/partial/extern/isotp-c/.gitmodules
...
[submodule "deps/bitfield-c"]
path = deps/bitfield-c
url = https://github.com/advancedtelematic/bitfield-c.git
...
but that recursive submodule is fetched but not unpacked.
the best,
thank you
Patrick Vacek <[email protected]> 於 2019年1月26日 週六 下午1:07寫道:
Quoted 20 lines · Stefan Agner
Quoted 6 lines
Quoted 3 lines
So it seems to be that something in the recipe was expecting semi-broken behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Sorry, I must be missing something. What might be wrong with the recipe? Is there more that needs to be specified than a SRCREV and a branch? As far as I understand git, it keeps track of the submodules, so I don't know what other information there would be to provide. The reason this particular case is difficult is because there are recursive submodules. When we build aktualizr, we have to be careful to specify that. See
https://github.com/advancedtelematic/aktualizr#building:git submodule update --init --recursive
Thanks,
Patrick
Quoted 17 lines · Patrick Vacek
Quoted 5 lines · Stefan Agner
Quoted 1 line
So it seems to be that something in the recipe was expecting
semi-broken
Quoted 1 line
behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Sorry, I must be missing something. What might be wrong with the recipe? Is there more that needs to be specified than a SRCREV and a branch? As far as I understand git, it keeps track of the submodules, so I don't know what other information there would be to provide. The reason this particular case is difficult is because there are recursive submodules. When we build aktualizr, we have to be careful to specify that. See
https://github.com/advancedtelematic/aktualizr#building:
Quoted 1 line
git submodule update --init --recursive
The problem is the checkout from the old version of the fetcher was broken, it incorrectly checked out that SRCREV. The recipe was written to build that broken checkout.
We've fixed the fetcher and Mark is saying that it now checks out the correct thing (as compared with a git checkout outside of the build system, independent of the fetcher).
The recipe assumed the old broken code so now fails to build. The recipe therefore needs to change to adapt to the now correct source code.
Cheers,
Richard
Quoted 24 lines · Richard Purdie
Quoted 17 lines · Patrick Vacek
Quoted 5 lines · Stefan Agner
Quoted 1 line
So it seems to be that something in the recipe was expecting
semi-broken
Quoted 1 line
behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Sorry, I must be missing something. What might be wrong with the recipe? Is there more that needs to be specified than a SRCREV and a branch? As far as I understand git, it keeps track of the submodules, so I don't know what other information there would be to provide. The reason this particular case is difficult is because there are recursive submodules. When we build aktualizr, we have to be careful to specify that. See
https://github.com/advancedtelematic/aktualizr#building:Quoted 1 line
git submodule update --init --recursive
The problem is the checkout from the old version of the fetcher was broken, it incorrectly checked out that SRCREV. The recipe was written to build that broken checkout.
Quoted 7 lines
We've fixed the fetcher and Mark is saying that it now checks out the correct thing (as compared with a git checkout outside of the build system, independent of the fetcher).
The recipe assumed the old broken code so now fails to build. The recipe therefore needs to change to adapt to the now correct source code.
I was not able to reproduce Marks findings.
In particular:
Quoted 7 lines
For instance, the submodule partial/extern/isotp-c:
In the current version is checked out on
4c5904bff3ed83ec471c8586b5faed62898d0224. (Which matches the manual git behavior.)While the gitsm fetcher in the older system checkedout commit
614fe48fe55aeea98b49804b7e31ef2d304f62de. Which is incorrect.
That wasn't the case for me, the old code checked out 4c5904bf just fine.
However, I think Ming Liu's recent findings point out the culprit.
The submodule isotp-c requires a submodule on its own, and the new code seems not to unpack that.
--
Stefan
Quoted 45 lines · Stefan Agner
Quoted 24 lines · Richard Purdie
Quoted 17 lines · Patrick Vacek
Quoted 5 lines · Stefan Agner
Quoted 1 line
So it seems to be that something in the recipe was expecting
semi-broken
Quoted 1 line
behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Sorry, I must be missing something. What might be wrong with the recipe? Is there more that needs to be specified than a SRCREV and a branch? As far as I understand git, it keeps track of the submodules, so I don't know what other information there would be to provide. The reason this particular case is difficult is because there are recursive submodules. When we build aktualizr, we have to be careful to specify that. See
https://github.com/advancedtelematic/aktualizr#building:Quoted 1 line
git submodule update --init --recursive
The problem is the checkout from the old version of the fetcher was broken, it incorrectly checked out that SRCREV. The recipe was written to build that broken checkout.
Quoted 7 lines
We've fixed the fetcher and Mark is saying that it now checks out the correct thing (as compared with a git checkout outside of the build system, independent of the fetcher).
The recipe assumed the old broken code so now fails to build. The recipe therefore needs to change to adapt to the now correct source code.
I was not able to reproduce Marks findings.
In particular:
Quoted 7 lines
For instance, the submodule partial/extern/isotp-c:
In the current version is checked out on
4c5904bff3ed83ec471c8586b5faed62898d0224. (Which matches the manual git behavior.)While the gitsm fetcher in the older system checkedout commit
614fe48fe55aeea98b49804b7e31ef2d304f62de. Which is incorrect.
Quoted 7 lines
That wasn't the case for me, the old code checked out
4c5904bfjust fine.However, I think Ming Liu's recent findings point out the culprit.
The submodule isotp-c requires a submodule on its own, and the new code seems not to unpack that.
i see what you are saying, but for some reason the version of git on my machine (using the steps I mentioned in the original email) for some reason did not pull down the recursive git submodule, which would explain why my diff didn't find it. (It's pretty clear to me that even within git itself, some submodule operations have been broken in various versions in the past.. my guess is that I'm hitting one of those errant behaviors locally.)
If I manually go to the isotp-c directory and run git init ; git submodule update it -then- downloads it. (So apparently the --recursive argument isn't in some versions. My system has 1.8.3.1 on it BTW.)
Looking at this quickly, I suspect I know what the problem is:
if not ud.bareclone and self.process_submodules(ud, ud.destdir,unpack_submodules, d):
if ud.bareclone is set, then python will optimize and not even run the process_submodules which is what does the unpack. This is set for recursive submodule parsing.
I'm getting ready to board a plane in a few hours. So it'll be a day or so before I can get back to this. I think I have a fix, see:
If you see this and can test it... I can formally send it for review if it's resolved the issues when I get to my destination.
--Mark
Hi, Mark:
I have done a quick test, seems the problem fixed with this patch, the steps are as follows:
``` bitbake aktualizr -c cleanall bitbake aktualizr ```
build succeeded.
the best,
thank you
Mark Hatle <[email protected]> 於 2019年1月27日 週日 上午2:19寫道:
Quoted 93 lines · Stefan Agner
Quoted 29 lines · Richard Purdie
Quoted 28 lines · Patrick Vacek
Quoted 17 lines
Quoted 5 lines · Stefan Agner
Quoted 1 line
So it seems to be that something in the recipe was expecting
semi-broken
Quoted 1 line
behavior.. and its actually a recipe problem.
Agreed, in this case we need to fix the recipe.
Sorry, I must be missing something. What might be wrong with the recipe? Is there more that needs to be specified than a SRCREV and a branch? As far as I understand git, it keeps track of the submodules, so I don't know what other information there would be to provide. The reason this particular case is difficult is because there are recursive submodules. When we build aktualizr, we have to be careful to specify that. See
https://github.com/advancedtelematic/aktualizr#building:Quoted 1 line
git submodule update --init --recursive
The problem is the checkout from the old version of the fetcher was broken, it incorrectly checked out that SRCREV. The recipe was written to build that broken checkout.
We've fixed the fetcher and Mark is saying that it now checks out the correct thing (as compared with a git checkout outside of the build system, independent of the fetcher).
Quoted 12 lines
Quoted 3 lines
The recipe assumed the old broken code so now fails to build. The recipe therefore needs to change to adapt to the now correct source code.
I was not able to reproduce Marks findings.
In particular:
Quoted 4 lines
For instance, the submodule partial/extern/isotp-c:
In the current version is checked out on
4c5904bff3ed83ec471c8586b5faed62898d0224. (Which matches the manualgit behavior.)
Quoted 11 lines
Quoted 3 lines
While the gitsm fetcher in the older system checkedout commit
614fe48fe55aeea98b49804b7e31ef2d304f62de. Which is incorrect.That wasn't the case for me, the old code checked out
4c5904bfjust fine.However, I think Ming Liu's recent findings point out the culprit.
The submodule isotp-c requires a submodule on its own, and the new code seems not to unpack that.
i see what you are saying, but for some reason the version of git on my machine
(using the steps I mentioned in the original email) for some reason did not pull
down the recursive git submodule, which would explain why my diff didn't find
it. (It's pretty clear to me that even within git itself, some submodule operations have been broken in various versions in the past.. my guess is that
I'm hitting one of those errant behaviors locally.)If I manually go to the isotp-c directory and run git init ; git submodule update it -then- downloads it. (So apparently the --recursive argument isn't in
some versions. My system has 1.8.3.1 on it BTW.)Looking at this quickly, I suspect I know what the problem is:
if not ud.bareclone and self.process_submodules(ud, ud.destdir,
unpack_submodules, d):if ud.bareclone is set, then python will optimize and not even run the
process_submoduleswhich is what does the unpack. This is set for recursive
submodule parsing.I'm getting ready to board a plane in a few hours. So it'll be a day or so before I can get back to this. I think I have a fix, see:
If you see this and can test it... I can formally send it for review if it's
resolved the issues when I get to my destination.--Mark