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.

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

Add info logs to make transaction of working copy merge more traceable #8178

Merged

Conversation

wangf1122
Copy link
Collaborator

@wangf1122 wangf1122 commented Jun 12, 2024

As to improve the traceability of issue #7952. More info log is added to make the file copy and resource folder deleting more transparent. So the developer and system admin will have better vision.

@wangf1122 wangf1122 marked this pull request as ready for review June 12, 2024 20:15
@josegar74 josegar74 added this to the 4.4.6 milestone Jun 13, 2024
Copy link
Member

@josegar74 josegar74 left a comment

Choose a reason for hiding this comment

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

Looks fine, please check the change suggestion.

@ianwallen ianwallen merged commit 4c63865 into geonetwork:main Jun 25, 2024
6 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit e904d4f7dad7608167d553d607b3d081bdf6c267 is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-8178-to-4.2.x 2bf83f6d53] Add info logs to make transaction of working copy merge more traceable
 Author: WANGF <[email protected]>
 Date: Wed Jun 12 16:12:19 2024 -0400
 2 files changed, 7 insertions(+)
[backport-8178-to-4.2.x 2b94f8437f] build fix
 Author: WANGF <[email protected]>
 Date: Wed Jun 12 16:39:50 2024 -0400
 1 file changed, 1 insertion(+), 1 deletion(-)
[backport-8178-to-4.2.x c0ad8fb0e4] Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java
 Author: wangf1122 <[email protected]>
 Date: Wed Jun 19 10:04:52 2024 -0400
 1 file changed, 1 insertion(+), 1 deletion(-)
[backport-8178-to-4.2.x 3f29b6fb13] Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java
 Author: wangf1122 <[email protected]>
 Date: Wed Jun 19 10:04:59 2024 -0400
 1 file changed, 1 insertion(+), 1 deletion(-)
[backport-8178-to-4.2.x 342aa8c69b] Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
 Author: wangf1122 <[email protected]>
 Date: Wed Jun 19 10:05:05 2024 -0400
 1 file changed, 1 insertion(+), 1 deletion(-)
[backport-8178-to-4.2.x a3b7d2fc1a] Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
 Author: wangf1122 <[email protected]>
 Date: Wed Jun 19 10:05:12 2024 -0400
 1 file changed, 1 insertion(+), 1 deletion(-)
[backport-8178-to-4.2.x 32ce8d2488] add more logs for delete folder
 Author: WANGF <[email protected]>
 Date: Mon Jun 24 10:00:03 2024 -0400
 3 files changed, 4 insertions(+)
[backport-8178-to-4.2.x c95d4071c8] build fix
 Author: WANGF <[email protected]>
 Date: Mon Jun 24 11:03:11 2024 -0400
 1 file changed, 1 insertion(+)

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8178-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d1fa3e68fa8f9b2360b67e62c8eb52497e7c3929,407bb2dacebb6b64f3347b926cfd5af6e4ccad49,205dd17ff02660be88a43298d7a80c271900d8bc,b71f369d2c51421a54591075e5dcbd00e513c4fc,7929f48dc61575c64bd379fda3bd2c7dd820f6c7,4cd72dc3a9d883a4e1cdb74b184b78ef3f786aaa,82868ffeeecda47c788d17a3049d46689eabbccd,2952fb3a0bfd6dd6f98fc8cc0547e11a38a0d1c8,e904d4f7dad7608167d553d607b3d081bdf6c267,24d865bdfb3c32db3bbfc5d5b1d6c3660dd1a056,6d11d5d99874f791c065f221069c27690130c350
# Push it to GitHub
git push --set-upstream origin backport-8178-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-8178-to-4.2.x.

ianwallen added a commit that referenced this pull request Jun 25, 2024
#8178)

* Add info logs to make transaction of working copy merge more traceable

* build fix

* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java

Co-authored-by: Jose García <[email protected]>

* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java

Co-authored-by: Jose García <[email protected]>

* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java

Co-authored-by: Jose García <[email protected]>

* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java

Co-authored-by: Jose García <[email protected]>

* add more logs for delete folder

* build fix

* build fix

* Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java

Co-authored-by: Jose García <[email protected]>

---------

Co-authored-by: Jose García <[email protected]>
Co-authored-by: Ian <[email protected]>
ianwallen added a commit that referenced this pull request Jun 25, 2024
#8178) (#8218)

* Add info logs to make transaction of working copy merge more traceable

* build fix

* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java



* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java



* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java



* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java



* add more logs for delete folder

* build fix

* build fix

* Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java



---------

Co-authored-by: wangf1122 <[email protected]>
Co-authored-by: Jose García <[email protected]>
josegar74 added a commit to GeoCat/core-geonetwork that referenced this pull request Jun 27, 2024
geonetwork#8178)

* Add info logs to make transaction of working copy merge more traceable

* build fix

* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java

Co-authored-by: Jose García <[email protected]>

* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java

Co-authored-by: Jose García <[email protected]>

* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java

Co-authored-by: Jose García <[email protected]>

* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java

Co-authored-by: Jose García <[email protected]>

* add more logs for delete folder

* build fix

* build fix

* Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java

Co-authored-by: Jose García <[email protected]>

---------

Co-authored-by: Jose García <[email protected]>
Co-authored-by: Ian <[email protected]>
fxprunayre pushed a commit to SPW-DIG/metawal-core-geonetwork that referenced this pull request Jul 18, 2024
geonetwork#8178)

* Add info logs to make transaction of working copy merge more traceable

* build fix

* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java

Co-authored-by: Jose García <[email protected]>

* Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java

Co-authored-by: Jose García <[email protected]>

* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java

Co-authored-by: Jose García <[email protected]>

* Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java

Co-authored-by: Jose García <[email protected]>

* add more logs for delete folder

* build fix

* build fix

* Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java

Co-authored-by: Jose García <[email protected]>

---------

Co-authored-by: Jose García <[email protected]>
Co-authored-by: Ian <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants