Skip to content

[Fix][admin] Fix resource same-name overwrite not refreshing local rs cache #4565

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

Open
fancy27 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[Fix][admin] Fix resource same-name overwrite not refreshing local rs cache #4565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 23 additions & 5 deletions dinky-admin/src/main/java/org/dinky/service/resource/impl/ResourceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,26 @@ public void upload(
new LambdaQueryWrapper<Resources>().eq(Resources::getPid, pid).eq(Resources::getFileName, fileName));
String fullName;
if (currentUploadResource != null) {
// Same-name overwrite: update remote storage and invalidate local tmp/rs cache
long oldSize = Opt.ofNullable(currentUploadResource.getSize()).orElse(0L);
if (desc != null) {
currentUploadResource.setDescription(desc);
}
fullName = currentUploadResource.getFullName();
currentUploadResource.setSize(size);
updateById(currentUploadResource);
uploadAction.accept(fullName);
URLUtils.clearRsLocalCache(fullName);

long delta = size - oldSize;
if (delta != 0) {
List<Resources> resourceByPidToParent = getResourceByPidToParent(new ArrayList<>(), pid);
resourceByPidToParent.forEach(x -> {
long parentSize = Opt.ofNullable(x.getSize()).orElse(0L);
x.setSize(Math.max(0L, parentSize + delta));
});
updateBatchById(resourceByPidToParent);
}
} else {
Resources resources = new Resources();
resources.setPid(pid);
Expand All @@ -283,12 +299,12 @@ public void upload(
resources.setSize(size);
resources.setDescription(desc);
saveOrUpdate(resources);
}
uploadAction.accept(fullName);
uploadAction.accept(fullName);

List<Resources> resourceByPidToParent = getResourceByPidToParent(new ArrayList<>(), pid);
resourceByPidToParent.forEach(x -> x.setSize(x.getSize() + size));
updateBatchById(resourceByPidToParent);
List<Resources> resourceByPidToParent = getResourceByPidToParent(new ArrayList<>(), pid);
resourceByPidToParent.forEach(x -> x.setSize(x.getSize() + size));
updateBatchById(resourceByPidToParent);
}
}

@Transactional(rollbackFor = Exception.class)
Expand Down Expand Up @@ -338,6 +354,8 @@ public boolean remove(Integer id) {
systemConfiguration.getResourcesModel().getValue().name(),
byId.getFullName());
}
// Always clear local rs cache so deleted/overwritten resources are not reused
URLUtils.clearRsLocalCache(byId.getFullName());
if (isExistsChildren(id)) {
if (byId.getIsDirectory()) {
List<Resources> resourceByPidToChildren =
Expand Down
44 changes: 41 additions & 3 deletions dinky-common/src/main/java/org/dinky/utils/URLUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,25 @@ public class URLUtils {
public static File toFile(String urlPath) {
try {
URL url = new URL(urlPath);
URLConnection urlConnection = url.openConnection();
if ("rs".equals(url.getProtocol())) {
String path = StrUtil.join(File.separator, TMP_PATH, "rs", url.getPath());
return FileUtil.writeFromStream(urlConnection.getInputStream(), path);
URLConnection urlConnection = url.openConnection();
// Avoid JVM URL / JarURLConnection caches returning stale jar content after overwrite
urlConnection.setUseCaches(false);
File target = getRsLocalFile(url.getPath());
// Delete existing file first so ClassLoader / JarFile does not keep the old inode
if (FileUtil.exist(target)) {
FileUtil.del(target);
}
FileUtil.mkParentDirs(target);
File tmpFile = FileUtil.file(target.getAbsolutePath() + ".downloading");
try {
FileUtil.writeFromStream(urlConnection.getInputStream(), tmpFile);
return FileUtil.move(tmpFile, target, true);
} finally {
if (FileUtil.exist(tmpFile)) {
FileUtil.del(tmpFile);
}
}
} else if ("file".equals(url.getProtocol())) {
return new File(url.getPath());
}
Expand All @@ -65,6 +80,29 @@ public static File toFile(String urlPath) {
}
}

/**
* Clear the local cache file (or directory) under tmp/rs for a resource fullName.
*
* <p>Used after resource overwrite / delete so subsequent rs:// loads do not reuse stale files.
*
* @param fullName resource full name stored in DB, e.g. {@code app.jar} or {@code dir/app.jar}
*/
public static void clearRsLocalCache(String fullName) {
if (StrUtil.isBlank(fullName)) {
return;
}
String relative = StrUtil.removePrefix(fullName, StrUtil.SLASH);
File localFile = FileUtil.file(TMP_PATH, "rs", relative);
if (FileUtil.exist(localFile)) {
FileUtil.del(localFile);
}
}

private static File getRsLocalFile(String urlPath) {
String relative = StrUtil.removePrefix(urlPath, StrUtil.SLASH);
return FileUtil.file(TMP_PATH, "rs", relative);
}

/**
* 获得URL，常用于使用绝对路径时的情况
*
Expand Down
Loading