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

ufal/be-s3-checker-sync #486

Merged
merged 16 commits into from
Dec 22, 2023
Merged

ufal/be-s3-checker-sync #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
906ddb4
The bitstream data are stored in to local store after uploading to S3
milanmajchrak Dec 18, 2023
9275741
The bitstream is removed from the S3 and local assetstore
milanmajchrak Dec 18, 2023
5828022
Store number is specific if all storages are synchronized.
milanmajchrak Dec 18, 2023
df6f5b1
Return store number in the BitstreamRest object
milanmajchrak Dec 19, 2023
c1e1176
Find out which store is used - it could be synchronized stores number.
milanmajchrak Dec 19, 2023
230b40f
Constant is moved to the Bitstream class
milanmajchrak Dec 19, 2023
bef2c7d
Synchronization of storages is not allowed by default - set up it in …
milanmajchrak Dec 19, 2023
4797907
Added docs
milanmajchrak Dec 20, 2023
3d4cb07
Removed constant from the Bitstream class - it wasn't consistent
milanmajchrak Dec 20, 2023
95fe6fb
Overriden BitstreamStorageServiceImpl by custom SyncBitstreamStorageS…
milanmajchrak Dec 20, 2023
bbd5bd8
Removed ClarinS3BitStoreService.java to SyncS3BitStoreService
milanmajchrak Dec 20, 2023
17cc19c
Added doc and refactoring.
milanmajchrak Dec 20, 2023
3b1d548
Fixed UserCheck - There was created a wrong select
milanmajchrak Dec 21, 2023
3f12a5a
Fixed ChecksumCheck - the session was closed but there were some requ…
milanmajchrak Dec 21, 2023
d0fe57f
Merge branch 'dtq-dev' into ufal/be-s3-checker-sync
milanmajchrak Dec 21, 2023
29695a0
Merge branch 'dtq-dev' into ufal/be-s3-checker-sync
milanmajchrak Dec 21, 2023
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
2 changes: 1 addition & 1 deletion dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public List<Collection> findAuthorizedByGroup(Context context, EPerson ePerson,

@Override
public List<Collection> findCollectionsWithSubscribers(Context context) throws SQLException {
return list(createQuery(context, "SELECT DISTINCT col FROM Subscription s join s.collection col"));
return list(createQuery(context, "SELECT DISTINCT col FROM Subscription s join s.dSpaceObject col"));
vidiecan marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
Expand Down
46 changes: 24 additions & 22 deletions dspace-api/src/main/java/org/dspace/health/ChecksumCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.dspace.checker.ChecksumResultsCollector;
import org.dspace.checker.MostRecentChecksum;
import org.dspace.checker.SimpleDispatcher;
import org.dspace.content.Bitstream;
import org.dspace.core.Context;

/**
Expand All @@ -40,37 +41,38 @@ public String run(ReportInfo ri) {
checker.setReportVerbose(true);
try {
checker.process();
if (collector.arr.size() > 0) {
ret = String.format("Checksum performed on [%d] items:\n",
collector.arr.size());
int ok_items = 0;
for (MostRecentChecksum bi : collector.arr) {
if (!ChecksumResultCode.CHECKSUM_MATCH.equals(bi
.getChecksumResult().getResultCode())) {
Bitstream reloadedBitstream = context.reloadEntity(bi.getBitstream());
ret += String
.format("md5 checksum FAILED (%s): %s id: %s bitstream-id: %s\n was: %s\n is: %s\n",
bi.getChecksumResult(), reloadedBitstream.getName(),
reloadedBitstream.getInternalId(), reloadedBitstream.getID(),
bi.getExpectedChecksum(),
bi.getCurrentChecksum());
} else {
ok_items++;
}
}

ret += String.format("checksum OK for [%d] items\n", ok_items);
}
context.complete();
context = null;
return ret;
} catch (SQLException e) {
error(e);
} finally {
if (context != null) {
context.abort();
}
}

if (collector.arr.size() > 0) {
ret = String.format("Checksum performed on [%d] items:\n",
collector.arr.size());
int ok_items = 0;
for (MostRecentChecksum bi : collector.arr) {
if (!ChecksumResultCode.CHECKSUM_MATCH.equals(bi
.getChecksumResult().getResultCode())) {
ret += String
.format("md5 checksum FAILED (%s): %s id: %s bitstream-id: %s\n was: %s\n is: %s\n",
bi.getChecksumResult(), bi.getBitstream().getName(),
bi.getBitstream().getInternalId(), bi.getBitstream().getID(),
bi.getExpectedChecksum(),
bi.getCurrentChecksum());
} else {
ok_items++;
}
}

ret += String.format("checksum OK for [%d] items\n", ok_items);
}
return ret;
return ret;
}
}

Expand Down
Loading