Skip to content

Commit cf69c4f

Browse files
author
chunmei
committed
crimson/vstart: add --seastore-device-size option in vstart.sh command line
default seastore_device_size will be out of space for smp >28 Signed-off-by: chunmei <[email protected]>
1 parent dfa63ee commit cf69c4f

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/crimson/os/seastore/async_cleaner.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ segment_id_t SegmentCleaner::allocate_segment(
986986
ERROR("out of space with {} {} {} {}",
987987
type, segment_seq_printer_t{seq}, category,
988988
rewrite_gen_printer_t{generation});
989-
ceph_abort();
989+
ceph_abort("seastore device size setting is too small");
990990
return NULL_SEG_ID;
991991
}
992992

src/vstart.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ options:
257257
--no-parallel: dont start all OSDs in parallel
258258
--no-restart: dont restart process when using ceph-run
259259
--jaeger: use jaegertracing for tracing
260+
--seastore-device-size: set total size of seastore
260261
--seastore-devs: comma-separated list of blockdevs to use for seastore
261262
--seastore-secondary-devs: comma-separated list of secondary blockdevs to use for seastore
262263
--seastore-secondary-devs-type: device type of all secondary blockdevs. HDD, SSD(default), ZNS or RANDOM_BLOCK_SSD
@@ -535,6 +536,10 @@ case $1 in
535536
--with-restful)
536537
with_mgr_restful=true
537538
;;
539+
--seastore-device-size)
540+
seastore_size="$2"
541+
shift
542+
;;
538543
--seastore-devs)
539544
parse_block_devs --seastore-devs "$2"
540545
shift
@@ -832,6 +837,14 @@ EOF
832837
bdev ioring = true"
833838
fi
834839
fi
840+
841+
if [ "$objectstore" == "seastore" ]; then
842+
if [[ ${seastore_size+x} ]]; then
843+
SEASTORE_OPTS="
844+
seastore device size = $seastore_size"
845+
fi
846+
fi
847+
835848
wconf <<EOF
836849
[client]
837850
$CCLIENTDEBUG
@@ -883,6 +896,7 @@ $BLUESTORE_OPTS
883896
; kstore
884897
kstore fsck on mount = true
885898
osd objectstore = $objectstore
899+
$SEASTORE_OPTS
886900
$COSDSHORT
887901
$(format_conf "${extra_conf}")
888902
[mon]

0 commit comments

Comments
 (0)