fix: Make file locking reactive compatible

[nidhi-nair]

Description

We were using try with resources method for reactive chains and the life cycle for this kind of access is unpredictable. Switched over to using the reactive equivalent for it across the board.

Also increased the default file lock TTL to 2 minutes instead of 20 seconds since our operations do take longer at times. This value was anyways a guardrail against error scenarios, typically we'd see the lock getting released correctly after every operation right away.

Potentially fixes #32858

Automation

/ok-to-test tags="@tag.Git"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/8926799294
Commit: 1e80d9a
Cypress dashboard url: Click here!

Communication

Should the DevRel and Marketing teams inform users about this change?

• Yes
• No

[coderabbitai]

Walkthrough

Walkthrough

The modification in RedisUtils.java involves adjusting the time limits for file locking to address issues related to stale lock files in git operations. This change aims to improve the robustness of file handling in environments with concurrent operations.

Changes

File Path	Change Summary
.../appsmith-server/src/.../helpers/RedisUtils.java	Increased FILE_LOCK_TIME_LIMIT from 20 seconds to 120 seconds
.../appsmith-server/src/.../services/ce/GitServiceCEImpl.java	Several adjustments in method declarations related to file locking operations in GitServiceCEImpl.java

Assessment against linked issues

Objective	Addressed	Explanation
Resolve stale git index.lock file issue (#32858)	✅	Extending the lock time limit in RedisUtils.java should help mitigate the issues caused by premature lock file release, which is directly related to the error described in the linked issue.

---

Recent Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 51c532a and 1e80d9a.

Files selected for processing (1)

• app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java (3 hunks)

Additional comments not posted (2)

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java (2)

1459-1459: Ensure proper error handling for the checkoutBranch method.

---

Line range hint 1463-1566: Optimize the checkoutRemoteBranch method for error handling and performance.

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[github-actions]

Failed server tests

• com.appsmith.server.git.GitServiceCETest#listBranchForApplication_defaultBranchChangesInRemoteDoesNotExistsInDB_Success
• com.appsmith.server.imports.internal.ImportServiceTests#importApplication_WhenUpdateLayoutFailures_Success

[github-actions]

Failed server tests

• com.appsmith.server.git.GitServiceCETest#listBranchForApplication_defaultBranchChangesInRemoteDoesNotExistsInDB_Success
• com.appsmith.server.services.ce.ApplicationServiceCETest#getApplicationByDefaultIdAndBranchName_emptyBranchName_success
• com.appsmith.server.services.ce.ApplicationServiceCETest#getApplicationsByBranchName_validBranchName_success