1. Patchew
  2. Libvirt
  3. View series

[libvirt] [PATCH] virfile: Detect ceph as shared FS

Michal Privoznik posted 1 patch 5 years, 2 months ago
Test syntax-check passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/394371407e46b98bb5ee1f419a9a6f920a4fab9f.1548430532.git.mprivozn@redhat.com
src/util/virfile.c            | 9 ++++++++-
src/util/virfile.h            | 1 +
src/util/virstoragefile.c     | 3 ++-
tests/virfiledata/mounts3.txt | 2 ++
tests/virfilemock.c           | 5 +++++
tests/virfiletest.c           | 1 +
6 files changed, 19 insertions(+), 2 deletions(-)
[libvirt] [PATCH] virfile: Detect ceph as shared FS
Posted by Michal Privoznik 5 years, 2 months ago 
https://bugzilla.redhat.com/show_bug.cgi?id=1665553

Ceph can be mounted just like any other filesystem and in fact is
a shared and cluster filesystem.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/util/virfile.c            | 9 ++++++++-
 src/util/virfile.h            | 1 +
 src/util/virstoragefile.c     | 3 ++-
 tests/virfiledata/mounts3.txt | 2 ++
 tests/virfilemock.c           | 5 +++++
 tests/virfiletest.c           | 1 +
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 263c92667c..271bf5e796 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -3465,6 +3465,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
 # ifndef FUSE_SUPER_MAGIC
 #  define FUSE_SUPER_MAGIC 0x65735546
 # endif
+# ifndef CEPH_SUPER_MAGIC
+#  define CEPH_SUPER_MAGIC 0x00C36400
+# endif
 
 # define PROC_MOUNTS "/proc/mounts"
 
@@ -3607,6 +3610,9 @@ virFileIsSharedFSType(const char *path,
     if ((fstypes & VIR_FILE_SHFS_CIFS) &&
         (f_type == CIFS_SUPER_MAGIC))
         return 1;
+    if ((fstypes & VIR_FILE_SHFS_CEPH) &&
+        (f_type == CEPH_SUPER_MAGIC))
+        return 1;
 
     return 0;
 }
@@ -3769,7 +3775,8 @@ int virFileIsSharedFS(const char *path)
                                  VIR_FILE_SHFS_OCFS |
                                  VIR_FILE_SHFS_AFS |
                                  VIR_FILE_SHFS_SMB |
-                                 VIR_FILE_SHFS_CIFS);
+                                 VIR_FILE_SHFS_CIFS |
+                                 VIR_FILE_SHFS_CEPH);
 }
 
 
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 93484e5444..65432da13a 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -220,6 +220,7 @@ enum {
     VIR_FILE_SHFS_AFS = (1 << 3),
     VIR_FILE_SHFS_SMB = (1 << 4),
     VIR_FILE_SHFS_CIFS = (1 << 5),
+    VIR_FILE_SHFS_CEPH = (1 << 6),
 };
 
 int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1);
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index bd4b0274df..895c8f90de 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1359,7 +1359,8 @@ int virStorageFileIsClusterFS(const char *path)
      */
     return virFileIsSharedFSType(path,
                                  VIR_FILE_SHFS_GFS2 |
-                                 VIR_FILE_SHFS_OCFS);
+                                 VIR_FILE_SHFS_OCFS |
+                                 VIR_FILE_SHFS_CEPH);
 }
 
 #ifdef LVS
diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
index 134c6e8f81..68eded048c 100644
--- a/tests/virfiledata/mounts3.txt
+++ b/tests/virfiledata/mounts3.txt
@@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,
 dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
 host:/gv0 /gluster fuse.glusterfs rw 0 0
 root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
+192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
+192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
diff --git a/tests/virfilemock.c b/tests/virfilemock.c
index fb6bd5e699..499135d773 100644
--- a/tests/virfilemock.c
+++ b/tests/virfilemock.c
@@ -86,6 +86,9 @@ setmntent(const char *filename, const char *type)
 #ifndef FUSE_SUPER_MAGIC
 # define FUSE_SUPER_MAGIC 0x65735546
 #endif
+#ifndef CEPH_SUPER_MAGIC
+# define CEPH_SUPER_MAGIC 0x00c36400
+#endif
 
 
 static int
@@ -132,6 +135,8 @@ statfs_mock(const char *mtab,
             ftype = CIFS_SUPER_MAGIC;
         } else if (STRPREFIX(mb.mnt_type, "fuse")) {
             ftype = FUSE_SUPER_MAGIC;
+        } else if (STRPREFIX(mb.mnt_type, "ceph")) {
+            ftype = CEPH_SUPER_MAGIC;
         } else {
             /* Everything else is EXT4. We don't care really for other paths. */
             ftype = EXT4_SUPER_MAGIC;
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index b1cb831bfd..6cc599a81b 100644
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -455,6 +455,7 @@ mymain(void)
     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true);
     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false);
     DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true);
+    DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true);
 
     return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
-- 
2.19.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] virfile: Detect ceph as shared FS
Posted by Erik Skultety 5 years, 2 months ago 
On Fri, Jan 25, 2019 at 04:35:42PM +0100, Michal Privoznik wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=1665553
>
> Ceph can be mounted just like any other filesystem and in fact is
> a shared and cluster filesystem.
>
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  src/util/virfile.c            | 9 ++++++++-
>  src/util/virfile.h            | 1 +
>  src/util/virstoragefile.c     | 3 ++-
>  tests/virfiledata/mounts3.txt | 2 ++
>  tests/virfilemock.c           | 5 +++++
>  tests/virfiletest.c           | 1 +
>  6 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/src/util/virfile.c b/src/util/virfile.c
> index 263c92667c..271bf5e796 100644
> --- a/src/util/virfile.c
> +++ b/src/util/virfile.c
> @@ -3465,6 +3465,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
>  # ifndef FUSE_SUPER_MAGIC
>  #  define FUSE_SUPER_MAGIC 0x65735546
>  # endif
> +# ifndef CEPH_SUPER_MAGIC
> +#  define CEPH_SUPER_MAGIC 0x00C36400

So, this truly is magic, as it's not exported from anywhere and it's hardcoded
in the kernel sources you showed me, so maybe a small comment into the commit
message where it comes from so that I won't have to ask you next time :P.

I'll try to cook up a kernel patch against magic.h

> +# endif
>
>  # define PROC_MOUNTS "/proc/mounts"
>
> @@ -3607,6 +3610,9 @@ virFileIsSharedFSType(const char *path,
>      if ((fstypes & VIR_FILE_SHFS_CIFS) &&
>          (f_type == CIFS_SUPER_MAGIC))
>          return 1;
> +    if ((fstypes & VIR_FILE_SHFS_CEPH) &&
> +        (f_type == CEPH_SUPER_MAGIC))
> +        return 1;
>
>      return 0;
>  }
> @@ -3769,7 +3775,8 @@ int virFileIsSharedFS(const char *path)
>                                   VIR_FILE_SHFS_OCFS |
>                                   VIR_FILE_SHFS_AFS |
>                                   VIR_FILE_SHFS_SMB |
> -                                 VIR_FILE_SHFS_CIFS);
> +                                 VIR_FILE_SHFS_CIFS |
> +                                 VIR_FILE_SHFS_CEPH);
>  }
>
>
> diff --git a/src/util/virfile.h b/src/util/virfile.h
> index 93484e5444..65432da13a 100644
> --- a/src/util/virfile.h
> +++ b/src/util/virfile.h
> @@ -220,6 +220,7 @@ enum {
>      VIR_FILE_SHFS_AFS = (1 << 3),
>      VIR_FILE_SHFS_SMB = (1 << 4),
>      VIR_FILE_SHFS_CIFS = (1 << 5),
> +    VIR_FILE_SHFS_CEPH = (1 << 6),
>  };
>
>  int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1);
> diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
> index bd4b0274df..895c8f90de 100644
> --- a/src/util/virstoragefile.c
> +++ b/src/util/virstoragefile.c
> @@ -1359,7 +1359,8 @@ int virStorageFileIsClusterFS(const char *path)
>       */
>      return virFileIsSharedFSType(path,
>                                   VIR_FILE_SHFS_GFS2 |
> -                                 VIR_FILE_SHFS_OCFS);
> +                                 VIR_FILE_SHFS_OCFS |
> +                                 VIR_FILE_SHFS_CEPH);
>  }
>
>  #ifdef LVS
> diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
> index 134c6e8f81..68eded048c 100644
> --- a/tests/virfiledata/mounts3.txt
> +++ b/tests/virfiledata/mounts3.txt
> @@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,
>  dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
>  host:/gv0 /gluster fuse.glusterfs rw 0 0
>  root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
> +192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
> +192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0

Are all of ^these addresses needed for the purposes of the test, wouldn't 1 be
enough? Just curious.

Reviewed-by: Erik Skultety <eskultet@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] virfile: Detect ceph as shared FS
Posted by Michal Privoznik 5 years, 2 months ago 
On 1/28/19 2:30 PM, Erik Skultety wrote:
> On Fri, Jan 25, 2019 at 04:35:42PM +0100, Michal Privoznik wrote:
>> https://bugzilla.redhat.com/show_bug.cgi?id=1665553
>>
>> Ceph can be mounted just like any other filesystem and in fact is
>> a shared and cluster filesystem.
>>
>> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
>> ---
>>   src/util/virfile.c            | 9 ++++++++-
>>   src/util/virfile.h            | 1 +
>>   src/util/virstoragefile.c     | 3 ++-
>>   tests/virfiledata/mounts3.txt | 2 ++
>>   tests/virfilemock.c           | 5 +++++
>>   tests/virfiletest.c           | 1 +
>>   6 files changed, 19 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/util/virfile.c b/src/util/virfile.c
>> index 263c92667c..271bf5e796 100644
>> --- a/src/util/virfile.c
>> +++ b/src/util/virfile.c
>> @@ -3465,6 +3465,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...)
>>   # ifndef FUSE_SUPER_MAGIC
>>   #  define FUSE_SUPER_MAGIC 0x65735546
>>   # endif
>> +# ifndef CEPH_SUPER_MAGIC
>> +#  define CEPH_SUPER_MAGIC 0x00C36400
> 
> So, this truly is magic, as it's not exported from anywhere and it's hardcoded
> in the kernel sources you showed me, so maybe a small comment into the commit
> message where it comes from so that I won't have to ask you next time :P.

Okay.

> 
> I'll try to cook up a kernel patch against magic.h
> 

Problem is that magic.h is not automatically generated. At least the 
part that contains the list of filesystems. There is plenty missing.

>> diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt
>> index 134c6e8f81..68eded048c 100644
>> --- a/tests/virfiledata/mounts3.txt
>> +++ b/tests/virfiledata/mounts3.txt
>> @@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255,
>>   dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0
>>   host:/gv0 /gluster fuse.glusterfs rw 0 0
>>   root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0
>> +192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
>> +192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0
> 
> Are all of ^these addresses needed for the purposes of the test, wouldn't 1 be
> enough? Just curious.

Actually, I forgot to add the second test case:

DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true);

> Reviewed-by: Erik Skultety <eskultet@redhat.com>

Pushed, thanks.

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.