Merge PR #58376 into main

* refs/pull/58376/head:
	Temporarily change the libcephfs dependencies
	proxy: Add the design document
	proxy: Add the proxy to the deb builds
	proxy: Add the proxy to the rpm builds
	Initial version of the libcephfs proxy

Reviewed-by: Sachin Prabhu <sp@spui.uk>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

6 files changed, 59 insertions, 0 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
index 32ca866d753..1d6ef3a34b5 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -38,4 +38,6 @@
 /python-cephfs
 /libcephfs-java
 /libcephfs-jni
+/libcephfs-proxy0-dbg
+/libcephfs-proxy0
 /tmp
diff --git a/debian/control b/debian/control
index d31a82bbc75..ec04c2599cd 100644
--- a/debian/control
+++ b/debian/control
@@ -891,6 +891,7 @@ Conflicts: libceph,
 Replaces: libceph,
           libceph1,
           libcephfs,
+Recommends: libcephfs-proxy2 (= ${binary:Version})
 Architecture: linux-any
 Section: libs
 Depends: ${misc:Depends},
@@ -919,10 +920,61 @@ Description: debugging symbols for libcephfs2
  .
  This package contains debugging symbols for libcephfs2.
 
+Package: libcephfs-proxy2
+Architecture: linux-any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: libcephfs-daemon (= ${binary:Version})
+Description: Libcephfs proxy library
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.  This allows applications to share
+ libcephfs' CephFS mounts to reduce resource consumption.
+
+Package: libcephfs-proxy2-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: libcephfs-proxy2 (= ${binary:Version}),
+         ${misc:Depends},
+Description: debugging symbols for libcephfs-proxy2
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.  This allows applications to share
+ libcephfs' CephFS mounts to reduce resource consumption.
+ .
+ This package contains debugging symbols for libcephfs-proxy2.
+
+Package: libcephfs-daemon
+Architecture: linux-any
+Depends: libcephfs2 (= ${binary:Version}),
+         ${misc:Depends},
+Description: Libcephfs proxy daemon
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.  This allows applications to share
+ libcephfs' CephFS mounts to reduce resource consumption.
+
+Package: libcephfs-daemon-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: libcephfs-daemon (= ${binary:Version}),
+         ${misc:Depends},
+Description: debugging symbols for libcephfs-daemon
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.  This allows applications to share
+ libcephfs' CephFS mounts to reduce resource consumption.
+ .
+ This package contains debugging symbols for libcephfs-proxy2.
+
 Package: libcephfs-dev
 Architecture: linux-any
 Section: libdevel
 Depends: libcephfs2 (= ${binary:Version}),
+         libcephfs-proxy2 (= ${binary:Version}),
          ${misc:Depends},
 Conflicts: libceph-dev,
            libceph1-dev,
diff --git a/debian/libcephfs-daemon.install b/debian/libcephfs-daemon.install
new file mode 100644
index 00000000000..454de46d2d7
--- /dev/null
+++ b/debian/libcephfs-daemon.install
@@ -0,0 +1 @@
+usr/sbin/libcephfsd
diff --git a/debian/libcephfs-dev.install b/debian/libcephfs-dev.install
index cf22dce62d4..40e37414051 100644
--- a/debian/libcephfs-dev.install
+++ b/debian/libcephfs-dev.install
@@ -3,3 +3,4 @@ usr/include/cephfs/libcephfs.h
 usr/include/cephfs/types.h
 usr/include/cephfs/metrics/Types.h
 usr/lib/libcephfs.so
+usr/lib/libcephfs_proxy.so
diff --git a/debian/libcephfs-proxy2.install b/debian/libcephfs-proxy2.install
new file mode 100644
index 00000000000..fc363125bc2
--- /dev/null
+++ b/debian/libcephfs-proxy2.install
@@ -0,0 +1 @@
+usr/lib/libcephfs_proxy.so.*
diff --git a/debian/rules b/debian/rules
index 3fbed3f3a2e..6c0ab5e12c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,6 +121,8 @@ override_dh_strip:
 	dh_strip -plibradosstriper1 --dbg-package=libradosstriper1-dbg
 	dh_strip -plibrbd1 --dbg-package=librbd1-dbg
 	dh_strip -plibcephfs2 --dbg-package=libcephfs2-dbg
+	dh_strip -plibcephfs-proxy2 --dbg-package=libcephfs-proxy2-dbg
+	dh_strip -plibcephfs-daemon --dbg-package=libcephfs-daemon-dbg
 	dh_strip -plibrgw2 --dbg-package=librgw2-dbg
 	dh_strip -pradosgw --dbg-package=radosgw-dbg
 	dh_strip -pceph-test --dbg-package=ceph-test-dbg