Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Make file locking reactive compatible (#33109)

Browse Source
This commit is contained in:
Nidhi 2024-05-02 22:24:49 +05:30 committed by GitHub
parent c41236845c
commit 718490f5bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 583 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1115
app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
View File

File diff suppressed because it is too large Load Diff

2
app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RedisUtils.java
View File

@ -19,7 +19,7 @@ public class RedisUtils {
private static final String AUTO_COMMIT_KEY_FORMAT = "autocommit_%s";
private static final String AUTO_COMMIT_PROGRESS_KEY_FORMAT = "autocommit_progress_%s";
private static final Duration FILE_LOCK_TIME_LIMIT = Duration.ofSeconds(20);
private static final Duration FILE_LOCK_TIME_LIMIT = Duration.ofSeconds(120);
private static final Duration AUTO_COMMIT_TIME_LIMIT = Duration.ofMinutes(3);

14
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
View File

@ -1416,7 +1416,6 @@ public class GitServiceCEImpl implements GitServiceCE {
gitArtifactMetadata.getRepoName());
return gitExecutor.listBranches(repoPath);
})
.flatMap(branchList -> releaseFileLock(defaultApplicationId).thenReturn(branchList))
.flatMap(gitBranchDTOList -> {
long branchMatchCount = gitBranchDTOList.stream()
.filter(gitBranchDTO ->
@ -1457,15 +1456,12 @@ public class GitServiceCEImpl implements GitServiceCE {
})
.tag(GitConstants.GitMetricConstants.CHECKOUT_REMOTE, FALSE.toString())
.name(GitSpan.OPS_CHECKOUT_BRANCH)
.tap(Micrometer.observation(observationRegistry))
.onErrorResume(throwable -> {
return Mono.error(throwable);
});
.tap(Micrometer.observation(observationRegistry));
}
private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, String branchName) {
Mono<Application> checkoutRemoteBranchMono = addFileLock(defaultApplicationId)
.flatMap(status -> getApplicationById(defaultApplicationId, applicationPermission.getEditPermission()))
Mono<Application> checkoutRemoteBranchMono = getApplicationById(
defaultApplicationId, applicationPermission.getEditPermission())
.flatMap(application -> {
GitArtifactMetadata gitArtifactMetadata = application.getGitApplicationMetadata();
String repoName = gitArtifactMetadata.getRepoName();
@ -1567,9 +1563,7 @@ public class GitServiceCEImpl implements GitServiceCE {
TRUE.equals(application1
.getGitApplicationMetadata()
.getIsRepoPrivate())))
.map(responseUtils::updateApplicationWithDefaultResources)
.flatMap(application1 ->
releaseFileLock(defaultApplicationId).then(Mono.just(application1)));
.map(responseUtils::updateApplicationWithDefaultResources);
})
.tag(GitConstants.GitMetricConstants.CHECKOUT_REMOTE, TRUE.toString())
.name(GitSpan.OPS_CHECKOUT_BRANCH)