@laveena-en Created ticket for this - https://zemoso.atlassian.net/browse/TNOSB-969

@laveena-en
Observed Issue

• When trying to commit and push changes to a remote branch (not the main branch) with existing remote changes:
• The app prompts, "Looks like there are pending upstream changes. To prevent you from losing history, we will pull the changes and push them to your repo."
• During the discard action, an Appsmith error occurs: "We were unable to place a lock on the file system to perform command. This error can occur when another process is in progress. Please try again later."

Root Cause Analysis

• The issue occurs when a commit command attempts to acquire a lock on the file system, which it then saves to Redis using baseArtifactId/baseAppId as the key.
• The lock has a duration of 3 minutes with 20 retries and a 1-second interval between retries.
• The commit command obtains this lock before the discard action is attempted. If the user quickly tries to discard, the lock remains active, and they must wait up to 3 minutes for it to be released.

@brayn003 Shall I work on this?

Solution : Call releaseFileLock() from CommonGitServiceCEImpl.java before throwing the GIT_UPSTREAM_CHANGES error.

Test Screen-Shots
When Branch : main

Adding one more page to the application

Deleting page-1 from remote

Trying to push


The application threw an error (AppsmithError.GIT_UPSTREAM_CHANGES) during execution.
We are asked to pull the changes
Clicking on discard and pull, right after the commit and push

No issue with the main branch.
(Since the block acquired by commit is released as part of the global exception handler, the URL exception handler extracts the artifactId specific to the branch. This artifactId is then used to save the lock in Redis, allowing it to be released with the same identifier. For other branches, the base artifactId and branched artifactId will differ, but in the main branch, both will remain the same.)

When Branch is Other than main
Before implementing the solution
I created a branch called test1, added a page locally, and deleted a page from the remote branch. When I tried to push, I received an 'UPSTREAM_GIT ERROR.' I attempted to discard my changes and pull the latest updates, but encountered the following error (see screenshot).

After implementing the solution:-
Branch : test - created from main

Add one more page & delete one page from remote


Trying to push

Getting error

right after, Discard and pull

No Error. since releaseLock() has been called just before error throw

Additionally, I am considering updating the error message shown during discard actions. Instead of the generic “another process is in progress,” the updated message would specify the exact process that has obtained the file lock. This change would provide more clarity and help in diagnosing similar issues in the future.

@laveena-en @nidhi-nair shall I proceed with PR

@shanid544 Thanks for showing interest in contributing to the appsmith. We would be thrilled to facilitate you in making your contribution. Let me first verify the solution and then can help you out with the right steps?
Thanks again @shanid544 !!

@sondermanish Please Verify and let me know.Thanks

@sondermanish Could you please review this approach

@shanid544 please proceed with your pr, the changes would do. Thanks again for taking the time to contribute to Appsmith!

@sondermanish Could you please review this PR