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.

Sign up for GitHub

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
merged 11 commits into from
Jun 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d1fa3e6
Add info logs to make transaction of working copy merge more traceable
wangf1122 Jun 12, 2024
407bb2d
build fix
wangf1122 Jun 12, 2024
205dd17
Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft…
wangf1122 Jun 19, 2024
b71f369
Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft…
wangf1122 Jun 19, 2024
7929f48
Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/att…
wangf1122 Jun 19, 2024
4cd72dc
Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/att…
wangf1122 Jun 19, 2024
82868ff
add more logs for delete folder
wangf1122 Jun 24, 2024
2952fb3
build fix
wangf1122 Jun 24, 2024
e904d4f
Merge branch 'geonetwork:main' into main.improve.logging.workingcopy.…
wangf1122 Jun 24, 2024
24d865b
build fix
wangf1122 Jun 24, 2024
6d11d5d
Update core/src/main/java/org/fao/geonet/api/records/attachments/File…
ianwallen Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@ public String delResources(final ServiceContext context, final int metadataId) t
folderKey = getMetadataDir(context, metadataId);
final Folder folder = cmisUtils.getFolderCache(folderKey, true);

Log.info(Geonet.RESOURCES, String.format("Deleting the folder of '%s' and the files within the folder", folderKey));
ianwallen marked this conversation as resolved.
Show resolved Hide resolved
folder.deleteTree(true, UnfileObject.DELETE, true);
cmisUtils.invalidateFolderCache(folderKey);

Expand Down Expand Up @@ -508,7 +509,9 @@ public MetadataResourceContainer getResourceContainerDescription(final ServiceCo
@Override
public void copyResources(ServiceContext context, String sourceUuid, String targetUuid, MetadataResourceVisibility metadataResourceVisibility, boolean sourceApproved, boolean targetApproved) throws Exception {
final int sourceMetadataId = canEdit(context, sourceUuid, metadataResourceVisibility, sourceApproved);
final int targetMetadataId = canEdit(context, sourceUuid, metadataResourceVisibility, targetApproved);
final String sourceResourceTypeDir = getMetadataDir(context, sourceMetadataId) + cmisConfiguration.getFolderDelimiter() + metadataResourceVisibility.toString();
final String targetResourceTypeDir = getMetadataDir(context, targetMetadataId) + cmisConfiguration.getFolderDelimiter() + metadataResourceVisibility.toString();
try {
Folder sourceParentFolder = cmisUtils.getFolderCache(sourceResourceTypeDir, true);

Expand All @@ -522,6 +525,8 @@ public void copyResources(ServiceContext context, String sourceUuid, String targ
for (Map.Entry<String, Document> sourceEntry : sourceDocumentMap.entrySet()) {
Document sourceDocument = sourceEntry.getValue();


Log.info(Geonet.RESOURCES, String.format("Copying %s to %s" , sourceResourceTypeDir+cmisConfiguration.getFolderDelimiter()+sourceDocument.getName(), targetResourceTypeDir));
// Get cmis properties from the source document
Map<String, Object> sourceProperties = getProperties(sourceDocument);
putResource(context, targetUuid, sourceDocument.getName(), sourceDocument.getContentStream().getStream(), null, metadataResourceVisibility, targetApproved, sourceProperties);
Expand Down
2 changes: 2 additions & 0 deletions listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public AbstractMetadata replaceMetadataWithDraft(AbstractMetadata md) {
* @return
*/
public AbstractMetadata replaceMetadataWithDraft(AbstractMetadata md, AbstractMetadata draft) {
Log.info(Geonet.DATA_MANAGER, String.format("Replacing metadata approved record (%d) with draft record (%d)", md.getId(), draft.getId()));
Log.trace(Geonet.DATA_MANAGER, "Found approved record with id " + md.getId());
Log.trace(Geonet.DATA_MANAGER, "Found draft with id " + draft.getId());
// Reassign metadata validations
Expand Down Expand Up @@ -131,6 +132,7 @@ public AbstractMetadata replaceMetadataWithDraft(AbstractMetadata md, AbstractMe
}

// Reassign file uploads
Log.info(Geonet.DATA_MANAGER, String.format("Copying draft record '%d' resources to approved record '%d'", draft.getId(), md.getId()));
draftMetadataUtils.replaceFiles(draft, md);

metadataFileUploadRepository.deleteAll(MetadataFileUploadSpecs.hasMetadataId(md.getId()));
Expand Down