Skip to content

Return TabletManager.GetPermissions results in a consistent order #4694

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
sougou merged 1 commit into from
Mar 31, 2019
Merged

Return TabletManager.GetPermissions results in a consistent order #4694

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions go/vt/mysqlctl/permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ import (
tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
)

// GetPermissions lists the permissions on the mysqld
// GetPermissions lists the permissions on the mysqld.
// The rows are sorted in primary key order to help with comparing
// permissions between tablets.
func GetPermissions(mysqld MysqlDaemon) (*tabletmanagerdatapb.Permissions, error) {
ctx := context.TODO()
permissions := &tabletmanagerdatapb.Permissions{}

// get Users
qr, err := mysqld.FetchSuperQuery(ctx, "SELECT * FROM mysql.user")
qr, err := mysqld.FetchSuperQuery(ctx, "SELECT * FROM mysql.user ORDER BY host, user")
if err != nil {
return nil, err
}
Expand All @@ -37,7 +39,7 @@ func GetPermissions(mysqld MysqlDaemon) (*tabletmanagerdatapb.Permissions, error
}

// get Dbs
qr, err = mysqld.FetchSuperQuery(ctx, "SELECT * FROM mysql.db")
qr, err = mysqld.FetchSuperQuery(ctx, "SELECT * FROM mysql.db ORDER BY host, db, user")
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtctl/vtctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2064,7 +2064,7 @@ func commandGetPermissions(ctx context.Context, wr *wrangler.Wrangler, subFlags
}
p, err := wr.GetPermissions(ctx, tabletAlias)
if err == nil {
wr.Logger().Infof("%v", p.String()) // they can contain '%'
printJSON(wr.Logger(), p)
}
return err
}
Expand Down
14 changes: 7 additions & 7 deletions go/vt/wrangler/testlib/permissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestPermissions(t *testing.T) {

// master will be asked for permissions
master.FakeMysqlDaemon.FetchSuperQueryMap = map[string]*sqltypes.Result{
"SELECT * FROM mysql.user": {
"SELECT * FROM mysql.user ORDER BY host, user": {
Fields: []*querypb.Field{
{
Name: "Host",
Expand Down Expand Up @@ -419,7 +419,7 @@ func TestPermissions(t *testing.T) {
},
},
},
"SELECT * FROM mysql.db": {
"SELECT * FROM mysql.db ORDER BY host, db, user": {
Fields: []*querypb.Field{
{
Name: "Host",
Expand Down Expand Up @@ -544,19 +544,19 @@ func TestPermissions(t *testing.T) {
defer master.StopActionLoop(t)

// Make a two-level-deep copy, so we can make them diverge later.
user := *master.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.user"]
user := *master.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.user ORDER BY host, user"]
user.Fields = append([]*querypb.Field{}, user.Fields...)

// replica will be asked for permissions
replica.FakeMysqlDaemon.FetchSuperQueryMap = map[string]*sqltypes.Result{
"SELECT * FROM mysql.user": &user,
"SELECT * FROM mysql.db": master.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.db"],
"SELECT * FROM mysql.user ORDER BY host, user": &user,
"SELECT * FROM mysql.db ORDER BY host, db, user": master.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.db ORDER BY host, db, user"],
}
replica.StartActionLoop(t, wr)
defer replica.StopActionLoop(t)

// Overwrite with the correct value to make sure it passes.
replica.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.user"].Fields[0] = &querypb.Field{
replica.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.user ORDER BY host, user"].Fields[0] = &querypb.Field{
Name: "Host",
Type: sqltypes.Char,
}
Expand All @@ -567,7 +567,7 @@ func TestPermissions(t *testing.T) {
}

// modify one field, this should fail
replica.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.user"].Fields[0] = &querypb.Field{
replica.FakeMysqlDaemon.FetchSuperQueryMap["SELECT * FROM mysql.user ORDER BY host, user"].Fields[0] = &querypb.Field{
Name: "Wrong",
Type: sqltypes.Char,
}
Expand Down