Merge branch 'master' into jjm-command-funcs-args-refactor

cephfs/cephfs.go

@@ -29,6 +29,14 @@ func createMount(id *C.char) (*MountInfo, error) {
 	return mount, nil
 }
 
+// validate checks whether mount.mount is ready to use or not.
+func (mount *MountInfo) validate() error {
+	if mount.mount == nil {
+		return ErrNotConnected
+	}
+	return nil
+}
+
 // CreateMount creates a mount handle for interacting with Ceph.
 func CreateMount() (*MountInfo, error) {
 	return createMount(nil)

cephfs/cephfs_test.go

@@ -269,3 +269,57 @@ func TestGetSetConfigOption(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, origVal, currVal)
 }
+
+func TestValidate(t *testing.T) {
+	mount, err := CreateMount()
+	assert.NoError(t, err)
+	assert.NotNil(t, mount)
+	defer assert.NoError(t, mount.Release())
+
+	t.Run("mountCurrentDir", func(t *testing.T) {
+		path := mount.CurrentDir()
+		assert.Equal(t, path, "")
+	})
+
+	t.Run("mountChangeDir", func(t *testing.T) {
+		err := mount.ChangeDir("someDir")
+		assert.Error(t, err)
+		assert.Equal(t, err, ErrNotConnected)
+	})
+
+	t.Run("mountMakeDir", func(t *testing.T) {
+		err := mount.MakeDir("someName", 0444)
+		assert.Error(t, err)
+		assert.Equal(t, err, ErrNotConnected)
+	})
+
+	t.Run("mountRemoveDir", func(t *testing.T) {
+		err := mount.RemoveDir("someDir")
+		assert.Error(t, err)
+		assert.Equal(t, err, ErrNotConnected)
+	})
+
+	t.Run("mountLink", func(t *testing.T) {
+		err := mount.Link("/", "/")
+		assert.Error(t, err)
+		assert.Equal(t, err, ErrNotConnected)
+	})
+
+	t.Run("mountUnlink", func(t *testing.T) {
+		err := mount.Unlink("someFile")
+		assert.Error(t, err)
+		assert.Equal(t, err, ErrNotConnected)
+	})
+
+	t.Run("mountSymlink", func(t *testing.T) {
+		err := mount.Symlink("/", "/")
+		assert.Error(t, err)
+		assert.Equal(t, err, ErrNotConnected)
+	})
+
+	t.Run("mountReadlink", func(t *testing.T) {
+		_, err := mount.Readlink("somePath")
+		assert.Error(t, err)
+		assert.Equal(t, err, ErrNotConnected)
+	})
+}

cephfs/path.go

@@ -14,12 +14,18 @@ import (
 
 // CurrentDir gets the current working directory.
 func (mount *MountInfo) CurrentDir() string {
+	if err := mount.validate(); err != nil {
+		return ""
+	}
 	cDir := C.ceph_getcwd(mount.mount)
 	return C.GoString(cDir)
 }
 
 // ChangeDir changes the current working directory.
 func (mount *MountInfo) ChangeDir(path string) error {
+	if err := mount.validate(); err != nil {
+		return err
+	}
 	cPath := C.CString(path)
 	defer C.free(unsafe.Pointer(cPath))
 
@@ -29,6 +35,9 @@ func (mount *MountInfo) ChangeDir(path string) error {
 
 // MakeDir creates a directory.
 func (mount *MountInfo) MakeDir(path string, mode uint32) error {
+	if err := mount.validate(); err != nil {
+		return err
+	}
 	cPath := C.CString(path)
 	defer C.free(unsafe.Pointer(cPath))
 
@@ -38,6 +47,9 @@ func (mount *MountInfo) MakeDir(path string, mode uint32) error {
 
 // RemoveDir removes a directory.
 func (mount *MountInfo) RemoveDir(path string) error {
+	if err := mount.validate(); err != nil {
+		return err
+	}
 	cPath := C.CString(path)
 	defer C.free(unsafe.Pointer(cPath))
 
@@ -50,6 +62,9 @@ func (mount *MountInfo) RemoveDir(path string) error {
 // Implements:
 //  int ceph_unlink(struct ceph_mount_info *cmount, const char *path);
 func (mount *MountInfo) Unlink(path string) error {
+	if err := mount.validate(); err != nil {
+		return err
+	}
 	cPath := C.CString(path)
 	defer C.free(unsafe.Pointer(cPath))
 
@@ -62,6 +77,9 @@ func (mount *MountInfo) Unlink(path string) error {
 // Implements:
 //  int ceph_link (struct ceph_mount_info *cmount, const char *existing, const char *newname);
 func (mount *MountInfo) Link(oldname, newname string) error {
+	if err := mount.validate(); err != nil {
+		return err
+	}
 	cOldname := C.CString(oldname)
 	defer C.free(unsafe.Pointer(cOldname))
 
@@ -77,6 +95,9 @@ func (mount *MountInfo) Link(oldname, newname string) error {
 // Implements:
 //  int ceph_symlink(struct ceph_mount_info *cmount, const char *existing, const char *newname);
 func (mount *MountInfo) Symlink(existing, newname string) error {
+	if err := mount.validate(); err != nil {
+		return err
+	}
 	cExisting := C.CString(existing)
 	defer C.free(unsafe.Pointer(cExisting))
 
@@ -92,6 +113,9 @@ func (mount *MountInfo) Symlink(existing, newname string) error {
 // Implements:
 //  int ceph_readlink(struct ceph_mount_info *cmount, const char *path, char *buf, int64_t size);
 func (mount *MountInfo) Readlink(path string) (string, error) {
+	if err := mount.validate(); err != nil {
+		return "", err
+	}
 	cPath := C.CString(path)
 	defer C.free(unsafe.Pointer(cPath))