From cfdd7d800c7c53052a0d9cbb2ce6dfa140d7bf7e Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Mon, 28 Nov 2016 09:08:28 -0800 Subject: [PATCH] ceph: add RGW to embedded ceph this commit adds RGW to rook. --- build/makelib/cephd.mk | 1 + ceph | 2 +- cmd/rookd/daemon.go | 2 +- pkg/cephmgr/cephd/cephd.go | 6 ++++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/makelib/cephd.mk b/build/makelib/cephd.mk index 90792faf6..6dc3d6c8a 100644 --- a/build/makelib/cephd.mk +++ b/build/makelib/cephd.mk @@ -40,6 +40,7 @@ CEPHD_CMAKE += \ -DALLOCATOR=$(CEPHD_ALLOCATOR) \ -DWITH_FUSE=OFF \ -DWITH_NSS=OFF \ + -DWITH_SYSTEM_BOOST=ON \ -DUSE_CRYPTOPP=ON \ -DWITH_LEVELDB=OFF \ -DWITH_XFS=OFF \ diff --git a/ceph b/ceph index e62bc8f1b..5e221dbee 160000 --- a/ceph +++ b/ceph @@ -1 +1 @@ -Subproject commit e62bc8f1bab5bd95b1486a7b856a275f70e4e10e +Subproject commit 5e221dbee418242fa07f16315cf44d5f8d69632b diff --git a/cmd/rookd/daemon.go b/cmd/rookd/daemon.go index d393b42a5..867451c5d 100644 --- a/cmd/rookd/daemon.go +++ b/cmd/rookd/daemon.go @@ -47,7 +47,7 @@ func runDaemon(cmd *cobra.Command, args []string) error { if err := flags.VerifyRequiredFlags(daemonCmd, []string{"type"}); err != nil { return err } - if daemonType != "mon" && daemonType != "osd" && daemonType != "mds" { + if daemonType != "mon" && daemonType != "osd" && daemonType != "mds" && daemonType != "rgw" { return fmt.Errorf("unknown daemon type: %s", daemonType) } diff --git a/pkg/cephmgr/cephd/cephd.go b/pkg/cephmgr/cephd/cephd.go index 3bbf7e1cb..9bba714f3 100644 --- a/pkg/cephmgr/cephd/cephd.go +++ b/pkg/cephmgr/cephd/cephd.go @@ -48,8 +48,8 @@ package cephd // #cgo tcmalloc,dynamic LDFLAGS: -Wl,-Bstatic -ltcmalloc_minimal -Wl,-Bdynamic // #cgo jemalloc tcmalloc CFLAGS: -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free // #cgo jemalloc tcmalloc CXXFLAGS: -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -// #cgo static LDFLAGS: -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -lm -ldl -lresolv -// #cgo dynamic LDFLAGS: -Wl,-Bstatic -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -Wl,-Bdynamic -ldl -lm -lresolv +// #cgo static LDFLAGS: -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -lcurl -lfcgi -lexpat -lm -ldl -lresolv +// #cgo dynamic LDFLAGS: -Wl,-Bstatic -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -laio -luuid -lcurl -lfcgi -lexpat -Wl,-Bdynamic -ldl -lm -lresolv // #include // #include // #include @@ -157,6 +157,8 @@ func (c *ceph) RunDaemon(daemon string, args ...string) error { ret = C.cephd_run_osd(C.int(len(finalArgs)), (**C.char)(ptr)) } else if daemon == "mds" { ret = C.cephd_run_mds(C.int(len(finalArgs)), (**C.char)(ptr)) + } else if daemon == "rgw" { + ret = C.cephd_run_rgw(C.int(len(finalArgs)), (**C.char)(ptr)) } if ret < 0 { return GetCephdError(int(ret))