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.

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

fix(ci): prevent truncating the upgrade proposal with tee #2453

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

gartnera
Copy link
Member

@gartnera gartnera commented Jul 8, 2024

Description

It seem the tee command sometimes opens and truncates upgrade.json before cat upgrade.json finishes reading it. Write it to a separate file to ensure this doesn't happen.

Old Description

Try to fix the upgrade tests by waiting a bit longer before submitting the proposal. I have no idea why this was stable for a long time but is now unstable.

Closes #2449

Update: this is not working:

upgrade-orchestrator  | 2024-07-08T22:29:48.730365325Z Submitting upgrade proposal
upgrade-orchestrator  | 2024-07-08T22:29:48.867226525Z Error: unexpected end of JSON input

How Has This Been Tested?

  • Tested CCTX in localnet
  • Tested in development environment
  • Go unit tests
  • Go integration tests
  • Tested via GitHub Actions

Summary by CodeRabbit

  • Chores
    • Updated synchronization logic to require a minimum height check of 2 instead of 1 before proceeding.

Copy link
Contributor

coderabbitai bot commented Jul 8, 2024

Walkthrough

This update modifies a script in the local network setup of the project, specifically start-upgrade-orchestrator.sh. The primary change is an increase in the minimum height check from 1 to 2 before proceeding, which affects the synchronization logic. No public or exported entity declarations are altered.

Changes

File Summary
contrib/localnet/scripts/start-upgrade-orchestrator.sh Increased the minimum height check from 1 to 2 before proceeding, affecting script synchronization logic.

Sequence Diagram(s)

No sequence diagrams necessary as the change pertains to a minor adjustment in script logic.

Poem

In the land of scripts where logic aligns,
The sync now waits till height is prime,
From one to two, the check does grow,
Ensuring all flows in a rhythm slow.
Code Rabbits cheer with every tweak,
As systems align in a dance unique!


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
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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @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.

@gartnera gartnera added no-changelog Skip changelog CI check UPGRADE_LIGHT_TESTS Run make start-upgrade-test-light labels Jul 8, 2024
@gartnera gartnera marked this pull request as ready for review July 8, 2024 19:59
@gartnera gartnera enabled auto-merge July 8, 2024 19:59
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between f45a56b and 0745d46.

Files selected for processing (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh (1 hunks)
Additional context used
Path-based instructions (1)
contrib/localnet/scripts/start-upgrade-orchestrator.sh (1)

Pattern **/*.sh: Review the shell scripts, point out issues relative to security, performance, and maintainability.

contrib/localnet/scripts/start-upgrade-orchestrator.sh Outdated Show resolved Hide resolved
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 0745d46 and 51d4e5f.

Files selected for processing (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh (1 hunks)
Additional context used
Path-based instructions (1)
contrib/localnet/scripts/start-upgrade-orchestrator.sh (1)

Pattern **/*.sh: Review the shell scripts, point out issues relative to security, performance, and maintainability.

Additional comments not posted (2)
contrib/localnet/scripts/start-upgrade-orchestrator.sh (2)

26-26: Update the echo statement to reflect the new height value.

The echo statement still references the old height value of 1. Update it to reflect the new height value of 2.

-    echo "current height is ${CURRENT_HEIGHT}, waiting for 1"
+    echo "current height is ${CURRENT_HEIGHT}, waiting for 2"

29-29: Update the echo statement to reflect the new height value.

The echo statement still references the old height value of 1. Update it to reflect the new height value of 2.

-    echo "current height is ${CURRENT_HEIGHT}, waiting for 1"
+    echo "current height is ${CURRENT_HEIGHT}, waiting for 2"

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 51d4e5f and 311c1dd.

Files selected for processing (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 311c1dd and 611ea80.

Files selected for processing (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh

@gartnera gartnera changed the title fix(ci): adjust upgrade orchestrator wait height fix(ci): prevent truncating the upgrade proposal with tee Jul 9, 2024
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 611ea80 and f53b239.

Files selected for processing (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • contrib/localnet/scripts/start-upgrade-orchestrator.sh

Copy link
Contributor

@CryptoFewka CryptoFewka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a safer approach

@gartnera gartnera added this pull request to the merge queue Jul 9, 2024
Merged via the queue into develop with commit b249faa Jul 9, 2024
38 of 44 checks passed
@gartnera gartnera deleted the fix-upgrade-test-submit branch July 9, 2024 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog Skip changelog CI check UPGRADE_LIGHT_TESTS Run make start-upgrade-test-light
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ci: submitting the upgrade proposal fails ~50% of the time
3 participants