Skip to content

fix: Fix the problem of unfiltered types in the backup database of cr… #8896

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.

Sign up for GitHub

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
f2c-ci-robot merged 1 commit into from
Jun 3, 2025
Merged

fix: Fix the problem of unfiltered types in the backup database of cr… #8896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions agent/app/service/cronjob_backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,13 @@ func loadDbsForJob(cronjob model.Cronjob) []DatabaseHelper {
var dbs []DatabaseHelper
if cronjob.DBName == "all" {
if cronjob.DBType == "mysql" || cronjob.DBType == "mariadb" {
mysqlItems, _ := mysqlRepo.List()
databaseService := NewIDatabaseService()
mysqlItems, _ := databaseService.LoadItems(cronjob.DBType)
for _, mysql := range mysqlItems {
dbs = append(dbs, DatabaseHelper{
ID: mysql.ID,
DBType: cronjob.DBType,
Database: mysql.MysqlName,
Database: mysql.Name,
Name: mysql.Name,
})
}
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 3, 2025

Choose a reason for hiding this comment

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

The provided code snippet seems to be attempting to load database information based on certain criteria from an interface-based repository (MySQLRepo), but it makes two mistakes that need correction:

  1. Misuse of Database Helper Method: The line dbs = append(dbs, DatabaseHelper{...}) implies that there is a method called LoadItems available within the databaseService. However, this method doesn't exist in the given code context.

  2. Improper Naming Convention: The variable name databaseService should likely refer to a service or factory type related to loading databases instead of directly accessing its methods.

To correct these issues without modifying other parts of the function unnecessarily, you can refactor the code as follows:

func loadDbsForJob(cronjob model.Cronjob) []DatabaseHelper {
    var dbs []DatabaseHelper

    if cronjob.DBName == "all" {
        if cronjob.DBType == "mysql" || cronjob.DBType == "mariadb" {
            // Assuming MySQLRepo has LoadAll() instead of List()
            mysqlItems, _ := mysqlRepo.LoadAll()

            // Alternatively, create a separate service for MySQL operations:
            dbService := NewDBServiceInterface() // Replace with actual implementation
            items, err := dbService.ListMysql()
            if err != nil {
                log.Println("Error fetching MySQL data:", err)
            } else {
                for _, item := range items {
                    dbs = append(dbs, DatabaseHelper{
                        ID:       item.ID,
                        DBType:   cronjob.DBType,
                        Database: item.Name, // Adjust field according to your DB struct definition
                        Name:     item.Name,
                    })
                }
            }

        } else { ... }
    } else { ... }
}

Key Points:

  • If mysqlRepo has a more convenient method like LoadAll() which returns all databases, then use that.
  • Ensure naming conventions align appropriately (e.g., using NewIDatabaseService, creating dbService for clarity).
  • Properly handle errors when fetching data from services or repositories.

Expand Down
Loading