diff --git a/ceph.bootstrap-mds.keyring b/ceph.bootstrap-mds.keyring deleted file mode 100644 index 3d7df52..0000000 --- a/ceph.bootstrap-mds.keyring +++ /dev/null @@ -1,3 +0,0 @@ -[client.bootstrap-mds] - key = AQDOy3xet8pzFxAAn/57Q2bDH8YvsSFQmwVwPA== - caps mon = "allow profile bootstrap-mds" diff --git a/ceph.bootstrap-mgr.keyring b/ceph.bootstrap-mgr.keyring deleted file mode 100644 index 2c62822..0000000 --- a/ceph.bootstrap-mgr.keyring +++ /dev/null @@ -1,3 +0,0 @@ -[client.bootstrap-mgr] - key = AQDOy3xe6Rx0FxAAHUiDMQndE+ta14msazLvjQ== - caps mon = "allow profile bootstrap-mgr" diff --git a/ceph.bootstrap-osd.keyring b/ceph.bootstrap-osd.keyring deleted file mode 100644 index 09376e5..0000000 --- a/ceph.bootstrap-osd.keyring +++ /dev/null @@ -1,3 +0,0 @@ -[client.bootstrap-osd] - key = AQDOy3xeBGx0FxAA9w8aLufA6wJ4o3q2eoVrlg== - caps mon = "allow profile bootstrap-osd" diff --git a/ceph.bootstrap-rgw.keyring b/ceph.bootstrap-rgw.keyring deleted file mode 100644 index 6724e87..0000000 --- a/ceph.bootstrap-rgw.keyring +++ /dev/null @@ -1,3 +0,0 @@ -[client.bootstrap-rgw] - key = AQDOy3xeJGF1FxAAa34GyVvvtCm0enqnLZgNrw== - caps mon = "allow profile bootstrap-rgw" diff --git a/ceph.client.admin.keyring b/ceph.client.admin.keyring deleted file mode 100644 index 9e46b0f..0000000 --- a/ceph.client.admin.keyring +++ /dev/null @@ -1,6 +0,0 @@ -[client.admin] - key = AQDOy3xeVlZzFxAAM+JvrWp58gxTNIV5q9e7kg== - caps mds = "allow *" - caps mgr = "allow *" - caps mon = "allow *" - caps osd = "allow *" diff --git a/ceph.client.ceph.keyring b/ceph.client.ceph.keyring deleted file mode 100644 index 68ab2d2..0000000 --- a/ceph.client.ceph.keyring +++ /dev/null @@ -1,2 +0,0 @@ -[client.ceph] - key = AQDwznxeNFj5IhAAUzp67JaKfgxB8k5WlbQSFQ== diff --git a/ceph.conf b/ceph.conf index b5bca10..390f3fb 100644 --- a/ceph.conf +++ b/ceph.conf @@ -1,10 +1,13 @@ [global] fsid = f33952a3-e074-458b-9ce8-e0e035a2f8c4 - log_to_file = true mon_host = [v2:192.168.10.160:3300,v1:192.168.10.160:6789], [v2:192.168.10.161:3300,v1:192.168.10.161:6789] mon_initial_members = pine01, pine02 mon_memory_target = 1610612736 + osd_max_backfills = 2 + osd_memory_base = 67108864 + osd_memory_cache_min = 33554432 + rocksdb_cache_size = 268435456 [mon] cluster_log_file_level = warn diff --git a/ceph.conf.assimilate.we-are-the-borg b/ceph.conf.assimilate.we-are-the-borg index 7ac39d1..7dd6278 100644 --- a/ceph.conf.assimilate.we-are-the-borg +++ b/ceph.conf.assimilate.we-are-the-borg @@ -1,6 +1,6 @@ [global] fsid = f33952a3-e074-458b-9ce8-e0e035a2f8c4 -log to file = true +log to file = false log to stderr = false log to syslog = false err to syslog = false @@ -34,15 +34,15 @@ osd max backfills = 2 #MEM #50mb / 5mb / 64mb osd memory target = 134217728 #128 Mb/ 5 sata ports -osd memory base = 134217728 #128 Mb/ 5 sata ports -osd memory cache min = 67108864 #64Mb +osd memory base = 67108864 #64MV 134217728 #128 Mb/ 5 sata ports +osd memory cache min = 33554432#32Mb 67108864 #64Mb bluestore cache autotune = true bluestore cache size = 52428800 bluestore cache size hdd = 5242880 bluestore cache size ssd = 5242880 #bluestore cache kv max = 67108864 -#rocksdb cache size = 5242880 - +rocksdb cache size = 268435456 +bluestore rocksdb options = compression=kNoCompression,max_write_buffer_number=4,min_write_buffer_number_to_merge=1,recycle_log_file_num=4,write_buffer_size=67108864,writable_file_max_buffer_size=0,compaction_readahead_size=2097152,max_background_compactions=2 #LOGGING off debug ms = 0/0 debug rados = 0/0 @@ -70,3 +70,4 @@ debug rocksdb = 0/0 [mds] debug mds = 0/0 debug mds balancer = 0/0 + mds cache memory limit = 536870912 diff --git a/ceph.mon.keyring b/ceph.mon.keyring deleted file mode 100644 index 6bed335..0000000 --- a/ceph.mon.keyring +++ /dev/null @@ -1,3 +0,0 @@ -[mon.] -key = AQD/yXxeAAAAABAAJhaRs9sKKAvHIg254QBojw== -caps mon = allow *