gluster/glusterd2
1
0
Fork 0
mirror of https://github.com/gluster/glusterd2.git synced 2026-02-05 12:45:38 +01:00
Code Issues Releases Activity

Fix golint and ineffassign issues

Browse Source 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
This commit is contained in:
Madhu Rajanna
2018-05-15 13:14:36 +05:30
parent 59b0b2f8ea
commit f4ecd14441
5 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glusterd2/commands/volumes/volume-create-txn.go
View File

@@ -197,9 +197,7 @@ func createVolinfo(c transaction.TxnCtx) error {
checks.IsOnRoot = true
}
if err := c.Set("brick-checks", &checks); err != nil {
return err
}
err = c.Set("brick-checks", &checks)
return nil
return err
}

6
glusterd2/commands/volumes/volume-expand-txn.go
View File

@@ -73,11 +73,9 @@ func expandValidatePrepare(c transaction.TxnCtx) error {
return err
}
if err := c.Set("volinfo", volinfo); err != nil {
return err
}
err = c.Set("volinfo", volinfo)
return nil
return err
}
func startBricksOnExpand(c transaction.TxnCtx) error {

6
glusterd2/commands/volumes/volume-option.go
View File

@@ -55,11 +55,9 @@ func optionSetValidate(c transaction.TxnCtx) error {
volinfo.Options[k] = v
}
if err := c.Set("volinfo", volinfo); err != nil {
return err
}
err = c.Set("volinfo", volinfo)
return nil
return err
}
type txnOpType uint8

6
glusterd2/config.go
View File

@@ -171,9 +171,7 @@ func initConfig(confFile string) error {
config.BindPFlags(flag.CommandLine)
// Finally initialize missing config with defaults
if err := setDefaults(); err != nil {
return err
}
err := setDefaults()
return nil
return err
}

6
pkg/utils/peerutils_test.go
View File

@@ -16,14 +16,14 @@ func TestIsPeerAddressSame(t *testing.T) {
}
func TestFormRemotePeerAddress(t *testing.T) {
peer, err := FormRemotePeerAddress("192.168.1.1:8080")
_, err := FormRemotePeerAddress("192.168.1.1:8080")
assert.Nil(t, err)
config.SetDefault("defaultpeerport", "80")
peer, err = FormRemotePeerAddress("192.168.1.1")
peer, err := FormRemotePeerAddress("192.168.1.1")
assert.Equal(t, peer, "192.168.1.1:80")
peer, err = FormRemotePeerAddress(":8080")
_, err = FormRemotePeerAddress(":8080")
assert.Contains(t, err.Error(), "Invalid peer address")
}