IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

add logs to debug failing migration (#52447)

Browse Source
This commit is contained in:
Ieva 2022-07-19 14:34:49 +01:00 committed by GitHub
parent 054fe54b03
commit 39025bb4cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
View File

@ -77,12 +77,12 @@ func (m dashboardPermissionsMigrator) Exec(sess *xorm.Session, migrator *migrato
var dashboards []dashboard var dashboards []dashboard
if err := m.sess.SQL("SELECT id, is_folder, folder_id, org_id FROM dashboard").Find(&dashboards); err != nil { if err := m.sess.SQL("SELECT id, is_folder, folder_id, org_id FROM dashboard").Find(&dashboards); err != nil {
return err return fmt.Errorf("failed to list dashboards: %w", err)
} }
var acl []models.DashboardACL var acl []models.DashboardACL
if err := m.sess.Find(&acl); err != nil { if err := m.sess.Find(&acl); err != nil {
return err return fmt.Errorf("failed to list dashboard ACL: %w", err)
} }
aclMap := make(map[int64][]models.DashboardACL, len(acl)) aclMap := make(map[int64][]models.DashboardACL, len(acl))
@ -90,14 +90,14 @@ func (m dashboardPermissionsMigrator) Exec(sess *xorm.Session, migrator *migrato
aclMap[p.DashboardID] = append(aclMap[p.DashboardID], p) aclMap[p.DashboardID] = append(aclMap[p.DashboardID], p)
} }
if err := m.migratePermissions(dashboards, aclMap); err != nil { if err := m.migratePermissions(dashboards, aclMap, migrator); err != nil {
return err return fmt.Errorf("failed to migrate permissions: %w", err)
} }
return nil return nil
} }
func (m dashboardPermissionsMigrator) migratePermissions(dashboards []dashboard, aclMap map[int64][]models.DashboardACL) error { func (m dashboardPermissionsMigrator) migratePermissions(dashboards []dashboard, aclMap map[int64][]models.DashboardACL, migrator *migrator.Migrator) error {
permissionMap := map[int64]map[string][]*ac.Permission{} permissionMap := map[int64]map[string][]*ac.Permission{}
for _, d := range dashboards { for _, d := range dashboards {
if d.ID == -1 { if d.ID == -1 {
@ -133,7 +133,7 @@ func (m dashboardPermissionsMigrator) migratePermissions(dashboards []dashboard,
for name := range roles { for name := range roles {
role, err := m.findRole(orgID, name) role, err := m.findRole(orgID, name)
if err != nil { if err != nil {
return err return fmt.Errorf("failed to find role %s: %w", name, err)
} }
if role.ID == 0 { if role.ID == 0 {
rolesToCreate = append(rolesToCreate, &ac.Role{OrgID: orgID, Name: name}) rolesToCreate = append(rolesToCreate, &ac.Role{OrgID: orgID, Name: name})
@ -143,9 +143,10 @@ func (m dashboardPermissionsMigrator) migratePermissions(dashboards []dashboard,
} }
} }
migrator.Logger.Debug(fmt.Sprintf("bulk-creating roles %v", rolesToCreate))
createdRoles, err := m.bulkCreateRoles(rolesToCreate) createdRoles, err := m.bulkCreateRoles(rolesToCreate)
if err != nil { if err != nil {
return err return fmt.Errorf("failed to bulk-create roles: %w", err)
} }
for i := range createdRoles { for i := range createdRoles {
@ -153,17 +154,18 @@ func (m dashboardPermissionsMigrator) migratePermissions(dashboards []dashboard,
} }
if err := m.bulkAssignRoles(createdRoles); err != nil { if err := m.bulkAssignRoles(createdRoles); err != nil {
return err return fmt.Errorf("failed to bulk-assign roles: %w", err)
} }
return m.setPermissions(allRoles, permissionMap) return m.setPermissions(allRoles, permissionMap, migrator)
} }
func (m dashboardPermissionsMigrator) setPermissions(allRoles []*ac.Role, permissionMap map[int64]map[string][]*ac.Permission) error { func (m dashboardPermissionsMigrator) setPermissions(allRoles []*ac.Role, permissionMap map[int64]map[string][]*ac.Permission, migrator *migrator.Migrator) error {
now := time.Now() now := time.Now()
for _, role := range allRoles { for _, role := range allRoles {
migrator.Logger.Debug(fmt.Sprintf("setting permissions for role %s with ID %d in org %d", role.Name, role.ID, role.OrgID))
if _, err := m.sess.Exec("DELETE FROM permission WHERE role_id = ? AND (action LIKE ? OR action LIKE ?)", role.ID, "dashboards%", "folders%"); err != nil { if _, err := m.sess.Exec("DELETE FROM permission WHERE role_id = ? AND (action LIKE ? OR action LIKE ?)", role.ID, "dashboards%", "folders%"); err != nil {
return err return fmt.Errorf("failed to clear dashboard and folder permissions for role: %w", err)
} }
var permissions []ac.Permission var permissions []ac.Permission
mappedPermissions := permissionMap[role.OrgID][role.Name] mappedPermissions := permissionMap[role.OrgID][role.Name]
@ -178,8 +180,9 @@ func (m dashboardPermissionsMigrator) setPermissions(allRoles []*ac.Role, permis
} }
err := batch(len(permissions), batchSize, func(start, end int) error { err := batch(len(permissions), batchSize, func(start, end int) error {
migrator.Logger.Debug(fmt.Sprintf("inserting permissions %v", permissions[start:end]))
if _, err := m.sess.InsertMulti(permissions[start:end]); err != nil { if _, err := m.sess.InsertMulti(permissions[start:end]); err != nil {
return err return fmt.Errorf("failed to create permissions for role: %w", err)
} }
return nil return nil
}) })

12
pkg/services/sqlstore/migrations/accesscontrol/permission_migrator.go
View File

@ -110,7 +110,7 @@ func (m *permissionMigrator) bulkAssignRoles(allRoles []*accesscontrol.Role) err
return err return err
}) })
if err != nil { if err != nil {
return err return fmt.Errorf("failed to create user role assignments: %w", err)
} }
err = batch(len(teamRoleAssignments), batchSize, func(start, end int) error { err = batch(len(teamRoleAssignments), batchSize, func(start, end int) error {
@ -118,12 +118,14 @@ func (m *permissionMigrator) bulkAssignRoles(allRoles []*accesscontrol.Role) err
return err return err
}) })
if err != nil { if err != nil {
return err return fmt.Errorf("failed to create team role assignments: %w", err)
} }
return batch(len(builtInRoleAssignments), batchSize, func(start, end int) error { return batch(len(builtInRoleAssignments), batchSize, func(start, end int) error {
_, err := m.sess.Table("builtin_role").InsertMulti(builtInRoleAssignments[start:end]) if _, err := m.sess.Table("builtin_role").InsertMulti(builtInRoleAssignments[start:end]); err != nil {
return err return fmt.Errorf("failed to create builtin role assignments: %w", err)
}
return nil
}) })
} }
@ -148,7 +150,7 @@ func (m *permissionMigrator) createRoles(roles []*accesscontrol.Role) ([]*access
valueString := strings.Join(valueStrings, ",") valueString := strings.Join(valueStrings, ",")
sql := fmt.Sprintf("INSERT INTO role (org_id, uid, name, version, created, updated) VALUES %s RETURNING id, org_id, name", valueString) sql := fmt.Sprintf("INSERT INTO role (org_id, uid, name, version, created, updated) VALUES %s RETURNING id, org_id, name", valueString)
if errCreate := m.sess.SQL(sql, args...).Find(&createdRoles); errCreate != nil { if errCreate := m.sess.SQL(sql, args...).Find(&createdRoles); errCreate != nil {
return nil, errCreate return nil, fmt.Errorf("failed to create roles: %w", errCreate)
} }
return createdRoles, nil return createdRoles, nil