Skip to content

GO-3358: Fix file migration: add to sync queue #1176

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

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

deff7
Copy link
Member

@deff7 deff7 commented Apr 24, 2024

Summary by CodeRabbit

  • New Features
    • Enhanced file migration process to improve synchronization and error handling.
  • Tests
    • Expanded testing for file handling and synchronization to ensure robust file migration and upload functionalities.
  • Refactor
    • Increased the storage capacity for file services to better support larger files.

Copy link

coderabbitai bot commented Apr 24, 2024

Walkthrough

The recent updates focus on enhancing file migration processes within a software system. Modifications include improved synchronization in migration functions, expanded testing for file handling and synchronization, and increased storage capacity in service testing. These changes aim to bolster reliability and efficiency in handling file migrations and uploads.

Changes

File Path Change Summary
.../fileobject/migration.go Added addToSyncQueue with new parameters and error handling in migrateDeriveObject.
.../fileobject/migration_test.go New imports, functions for file handling, and updated tests for migration and upload processes.
.../fileobject/service_test.go Added commonFileService to fixture and increased rpcStore size in newFixture.

🐇✨
A hop, a skip, in the code we weave,
Syncing files, with ease, we achieve.
From bits so small, to data so grand,
Through wires and clouds, across the land.
Cheers to bytes that dance and prance,
In the digital fields, our code does advance. 🌟
🐇💻


Recent Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 6d86440 and e4500a9.
Files selected for processing (3)
  • core/files/fileobject/migration.go (1 hunks)
  • core/files/fileobject/migration_test.go (5 hunks)
  • core/files/fileobject/service_test.go (3 hunks)
Additional comments not posted (3)
core/files/fileobject/service_test.go (2)

46-46: Addition of commonFileService enhances the test setup.

This change supports new file handling and synchronization tests, aligning with the PR objectives.


59-59: Increase in rpcStore size is appropriate for the updated requirements.

This change likely aims to accommodate larger data sets in testing scenarios, reflecting the increased demands of the updated file migration and synchronization processes.

core/files/fileobject/migration_test.go (1)

4-14: Addition of new imports and functions supports updated file migration and upload processes.

These changes are essential for validating the new functionality and ensuring that it integrates seamlessly with existing systems.


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.

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.

Copy link

@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

Comment on lines +178 to +190
fullFileId := domain.FullFileId{SpaceId: space.Id(), FileId: req.FileId}
err = s.indexer.addToQueue(ctx, domain.FullID{SpaceID: space.Id(), ObjectID: id}, fullFileId)
if err != nil {
// Will be retried in background, so don't return error
log.Errorf("add to index queue: %v", err)
err = nil
}
return err

err = s.addToSyncQueue(id, fullFileId, false, false)
if err != nil {
return fmt.Errorf("add to sync queue: %w", err)
}
return nil
Copy link

Choose a reason for hiding this comment

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

Consider revising the error handling strategy for adding to the sync queue.

The current implementation suppresses the error from addToSyncQueue by setting err to nil after logging. This could potentially hide issues that might need attention. Consider allowing this error to propagate or ensuring it is handled appropriately elsewhere in the system.

-		log.Errorf("add to index queue: %v", err)
-		err = nil

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
fullFileId := domain.FullFileId{SpaceId: space.Id(), FileId: req.FileId}
err = s.indexer.addToQueue(ctx, domain.FullID{SpaceID: space.Id(), ObjectID: id}, fullFileId)
if err != nil {
// Will be retried in background, so don't return error
log.Errorf("add to index queue: %v", err)
err = nil
}
return err
err = s.addToSyncQueue(id, fullFileId, false, false)
if err != nil {
return fmt.Errorf("add to sync queue: %w", err)
}
return nil
fullFileId := domain.FullFileId{SpaceId: space.Id(), FileId: req.FileId}
err = s.indexer.addToQueue(ctx, domain.FullID{SpaceID: space.Id(), ObjectID: id}, fullFileId)
if err != nil {
// Will be retried in background, so don't return error
log.Errorf("add to index queue: %v", err)
}
err = s.addToSyncQueue(id, fullFileId, false, false)
if err != nil {
return fmt.Errorf("add to sync queue: %w", err)
}
return nil

@deff7 deff7 merged commit 85f5c40 into main Apr 24, 2024
@deff7 deff7 deleted the go-3358-fix-migration-add-to-sync-queue branch April 24, 2024 11:35
@github-actions github-actions bot locked and limited conversation to collaborators Apr 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants