diff --git a/examples/mooncake_store/README.md b/examples/cache_storage/README.md similarity index 100% rename from examples/mooncake_store/README.md rename to examples/cache_storage/README.md diff --git a/examples/mooncake_store/mooncake_config.json b/examples/cache_storage/mooncake_config.json similarity index 81% rename from examples/mooncake_store/mooncake_config.json rename to examples/cache_storage/mooncake_config.json index 6e794d2214..560f3bda9a 100644 --- a/examples/mooncake_store/mooncake_config.json +++ b/examples/cache_storage/mooncake_config.json @@ -4,6 +4,6 @@ "global_segment_size":8589934592, "local_buffer_size":134217728, "protocol":"rdma", - "rdma_devices": "mlx5_1,mlx5_2,mlx5_3,mlx5_4", + "rdma_devices": "", "master_server_addr":"0.0.0.0:15001" } diff --git a/examples/mooncake_store/run.sh b/examples/cache_storage/run.sh similarity index 99% rename from examples/mooncake_store/run.sh rename to examples/cache_storage/run.sh index 842e084cfd..67424b367b 100644 --- a/examples/mooncake_store/run.sh +++ b/examples/cache_storage/run.sh @@ -17,7 +17,6 @@ S1_PORT=52800 ports=( $S0_PORT $((S0_PORT + 1)) $((S0_PORT + 2)) $((S0_PORT + 3)) $S1_PORT $((S1_PORT + 1)) $((S1_PORT + 2)) $((S1_PORT + 3)) - $ROUTER_PORT ) check_ports "${ports[@]}" || { echo "❌ Some ports are in use. Please release them." diff --git a/examples/mooncake_store/utils.sh b/examples/cache_storage/utils.sh similarity index 100% rename from examples/mooncake_store/utils.sh rename to examples/cache_storage/utils.sh diff --git a/fastdeploy/cache_manager/transfer_factory/mooncake_store/mooncake_store.py b/fastdeploy/cache_manager/transfer_factory/mooncake_store/mooncake_store.py index 3311bc3f25..ac7d793ad6 100644 --- a/fastdeploy/cache_manager/transfer_factory/mooncake_store/mooncake_store.py +++ b/fastdeploy/cache_manager/transfer_factory/mooncake_store/mooncake_store.py @@ -50,10 +50,10 @@ class MooncakeStoreConfig: file_path = os.getenv("MOONCAKE_CONFIG_PATH") if file_path is None: - local_hostname = os.environ.get("MOONCAKE_LOCAL_HOSTNAME") + local_hostname = os.environ.get("MOONCAKE_LOCAL_HOSTNAME", "localhost") metadata_server = os.environ.get("MOONCAKE_METADATA_SERVER") - global_segment_size = os.environ.get("MOONCAKE_GLOBAL_SEGMENT_SIZE", DEFAULT_GLOBAL_SEGMENT_SIZE) - local_buffer_size = os.environ.get("MOONCAKE_LOCAL_BUFFER_SIZE", DEFAULT_LOCAL_BUFFER_SIZE) + global_segment_size = int(os.environ.get("MOONCAKE_GLOBAL_SEGMENT_SIZE", DEFAULT_GLOBAL_SEGMENT_SIZE)) + local_buffer_size = int(os.environ.get("MOONCAKE_LOCAL_BUFFER_SIZE", DEFAULT_LOCAL_BUFFER_SIZE)) protocol = os.environ.get("MOONCAKE_PROTOCOL", "rdma") rdma_devices = os.environ.get("MOONCAKE_RDMA_DEVICES", "") master_server_addr = os.environ.get("MOONCAKE_MASTER_SERVER_ADDR") @@ -63,10 +63,10 @@ class MooncakeStoreConfig: with open(file_path) as fin: config = json.load(fin) - local_hostname = config.get("local_hostname") + local_hostname = config.get("local_hostname", "localhost") metadata_server = config.get("metadata_server") - global_segment_size = config.get("global_segment_size", DEFAULT_GLOBAL_SEGMENT_SIZE) - local_buffer_size = config.get("local_buffer_size", DEFAULT_LOCAL_BUFFER_SIZE) + global_segment_size = int(config.get("global_segment_size", DEFAULT_GLOBAL_SEGMENT_SIZE)) + local_buffer_size = int(config.get("local_buffer_size", DEFAULT_LOCAL_BUFFER_SIZE)) protocol = config.get("protocol", "rdma") rdma_devices = config.get("rdma_devices", "") master_server_addr = config.get("master_server_addr") @@ -75,6 +75,8 @@ class MooncakeStoreConfig: # FIXME: use auto-select NICs in MooncakeStore will raise error and roll back to using TCP rdma_devices = get_rdma_nics() logger.info(f"No RDMA devices specified, defaulting to all available devices: {rdma_devices}") + if metadata_server is None or master_server_addr is None: + raise ValueError("Both MOONCAKE_METADATA_SERVER and MOONCAKE_MASTER_SERVER_ADDR must be provided.") return MooncakeStoreConfig( local_hostname=local_hostname,