Attachment #202332 for bug #236004

View | Details | Raw Unified | Return to bug 236004
Collapse All | Expand All

Lines 3-11 Link Here

(-)net/ceph12/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= ceph	4	PORTNAME= ceph
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 12.2.7	6	DISTVERSION= 12.2.11
7	PORTREVISION= 3
8	CATEGORIES= net	7	CATEGORIES= net
		8	PKGNAMESUFFIX= 12
9		9
10	MAINTAINER= wjw@digiware.nl	10	MAINTAINER= wjw@digiware.nl
11	COMMENT= Ceph delivers object, block, and file storage in a unified system	11	COMMENT= Ceph delivers object, block, and file storage in a unified system

Lines 1-6 Link Here

(-)net/ceph12/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535200366	1	TIMESTAMP = 1550935963
2	SHA256 (ceph-ceph-v12.2.7_GH0.tar.gz) = 742dd402686b6c48824687be9bff951ede7608d41736cbcd55b130f7bd94f086	2	SHA256 (ceph-ceph-v12.2.11_GH0.tar.gz) = 67a2afe2de2087279e5a6bfab9c2b2a391093fb73723b629aaaeb204044be499
3	SIZE (ceph-ceph-v12.2.7_GH0.tar.gz) = 12236446	3	SIZE (ceph-ceph-v12.2.11_GH0.tar.gz) = 12451786
4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490	4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656	5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
6	SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214	6	SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214

Lines 1-2 Link Here

(-)net/ceph12/files/file-git_version (-2 / +2 lines)
1	3ec878d1e53e1aeb47a9f619c49d9e7c0aa384d5	1	26dc3775efc7bb286a1d6d66faee0ba30ea23eee
2	v12.2.7	2	v12.2.11




diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
old mode 100644
new mode 100755
index 326c9785d0..8d39249360
--- src/test/objectstore/store_test.cc
+++ src/test/objectstore/store_test.cc
@@ -4313,7 +4313,7 @@ TEST_P(StoreTest, Synthetic) {
   doSyntheticTest(store, 10000, 400*1024, 40*1024, 0);
 }
 
-
+#if defined(WITH_BLUESTORE)
 TEST_P(StoreTestSpecificAUSize, SyntheticMatrixSharding) {
   if (string(GetParam()) != "bluestore")
     return;
@@ -4485,6 +4485,7 @@ TEST_P(StoreTestSpecificAUSize, SyntheticMatrixPreferDeferred) {
   };
   do_matrix(m, store, doSyntheticTest);
 }
+#endif // #if defined(WITH_BLUESTORE)
 
 TEST_P(StoreTest, AttrSynthetic) {
   ObjectStore::Sequencer osr("test");
@@ -6855,6 +6856,7 @@ TEST_P(StoreTestSpecificAUSize, fsckOnUnalignedDevice2) {
   g_conf->apply_changes(NULL);
 }
 
+#if defined(WITH_BLUESTORE)
 TEST_P(StoreTest, SpuriousReadErrorTest) {
   if (string(GetParam()) != "bluestore")
     return;
@@ -6921,6 +6923,7 @@ TEST_P(StoreTest, SpuriousReadErrorTest) {
   g_conf->set_val("bluestore_debug_inject_csum_err_probability", "0");
   g_ceph_context->_conf->apply_changes(nullptr);
 }
+#endif // #if defined(WITH_BLUESTORE)
 
 int main(int argc, char **argv) {
   vector<const char*> args;




diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 57cb2a5b94..57a9ceb78b 100644
--- src/rgw/CMakeLists.txt
+++ src/rgw/CMakeLists.txt
@@ -182,7 +182,7 @@ if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)
 endif()
 
 add_executable(radosgw rgw_main.cc)
-target_link_libraries(radosgw radosgw_a librados
+target_link_libraries(radosgw radosgw_a rgw_a librados
   cls_rgw_client cls_lock_client cls_refcount_client
   cls_log_client cls_statelog_client cls_timeindex_client
   cls_version_client cls_replica_log_client cls_user_client




diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
index aa58219b5a..de4200d75e 100644
--- src/rgw/rgw_sync_module_es.cc
+++ src/rgw/rgw_sync_module_es.cc
@@ -244,7 +244,7 @@ struct es_index_config {
 };
 
 static bool is_sys_attr(const std::string& attr_name){
-  static constexpr std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
+  static const std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
                                                                        RGW_ATTR_SOURCE_ZONE,
                                                                        RGW_ATTR_ID_TAG,
                                                                        RGW_ATTR_TEMPURL_KEY1,

Lines 104-109 Link Here

(-)net/ceph12/pkg-plist (+1 lines)
104	lib/ceph/mgr/dashboard/base.html	104	lib/ceph/mgr/dashboard/base.html
105	lib/ceph/mgr/dashboard/cephfs_clients.py	105	lib/ceph/mgr/dashboard/cephfs_clients.py
106	lib/ceph/mgr/dashboard/clients.html	106	lib/ceph/mgr/dashboard/clients.html
		107	lib/ceph/mgr/dashboard/config_options.html
107	lib/ceph/mgr/dashboard/filesystem.html	108	lib/ceph/mgr/dashboard/filesystem.html
108	lib/ceph/mgr/dashboard/health.html	109	lib/ceph/mgr/dashboard/health.html
109	lib/ceph/mgr/dashboard/module.py	110	lib/ceph/mgr/dashboard/module.py

Return to bug 236004

Line 0 Link Here

(-)net/ceph12/files/patch-src_objectstore_store_test.cc (+39 lines)
	1	diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
	2	old mode 100644
	3	new mode 100755
	4	index 326c9785d0..8d39249360
	5	--- src/test/objectstore/store_test.cc
	6	+++ src/test/objectstore/store_test.cc
	7	@@ -4313,7 +4313,7 @@ TEST_P(StoreTest, Synthetic) {
	8	doSyntheticTest(store, 10000, 4001024, 401024, 0);
	9	}
	10
	11	-
	12	+#if defined(WITH_BLUESTORE)
	13	TEST_P(StoreTestSpecificAUSize, SyntheticMatrixSharding) {
	14	if (string(GetParam()) != "bluestore")
	15	return;
	16	@@ -4485,6 +4485,7 @@ TEST_P(StoreTestSpecificAUSize, SyntheticMatrixPreferDeferred) {
	17	};
	18	do_matrix(m, store, doSyntheticTest);
	19	}
	20	+#endif // #if defined(WITH_BLUESTORE)
	21
	22	TEST_P(StoreTest, AttrSynthetic) {
	23	ObjectStore::Sequencer osr("test");
	24	@@ -6855,6 +6856,7 @@ TEST_P(StoreTestSpecificAUSize, fsckOnUnalignedDevice2) {
	25	g_conf->apply_changes(NULL);
	26	}
	27
	28	+#if defined(WITH_BLUESTORE)
	29	TEST_P(StoreTest, SpuriousReadErrorTest) {
	30	if (string(GetParam()) != "bluestore")
	31	return;
	32	@@ -6921,6 +6923,7 @@ TEST_P(StoreTest, SpuriousReadErrorTest) {
	33	g_conf->set_val("bluestore_debug_inject_csum_err_probability", "0");
	34	g_ceph_context->_conf->apply_changes(nullptr);
	35	}
	36	+#endif // #if defined(WITH_BLUESTORE)
	37
	38	int main(int argc, char **argv) {
	39	vector<const char*> args;

Line 0 Link Here

(-)net/ceph12/files/patch-src_rgw_CMakeLists.txt (+13 lines)
	1	diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
	2	index 57cb2a5b94..57a9ceb78b 100644
	3	--- src/rgw/CMakeLists.txt
	4	+++ src/rgw/CMakeLists.txt
	5	@@ -182,7 +182,7 @@ if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)
	6	endif()
	7
	8	add_executable(radosgw rgw_main.cc)
	9	-target_link_libraries(radosgw radosgw_a librados
	10	+target_link_libraries(radosgw radosgw_a rgw_a librados
	11	cls_rgw_client cls_lock_client cls_refcount_client
	12	cls_log_client cls_statelog_client cls_timeindex_client
	13	cls_version_client cls_replica_log_client cls_user_client

Line 0 Link Here

(-)net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc (+13 lines)
	1	diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
	2	index aa58219b5a..de4200d75e 100644
	3	--- src/rgw/rgw_sync_module_es.cc
	4	+++ src/rgw/rgw_sync_module_es.cc
	5	@@ -244,7 +244,7 @@ struct es_index_config {
	6	};
	7
	8	static bool is_sys_attr(const std::string& attr_name){
	9	- static constexpr std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
	10	+ static const std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
	11	RGW_ATTR_SOURCE_ZONE,
	12	RGW_ATTR_ID_TAG,
	13	RGW_ATTR_TEMPURL_KEY1,