diff --git a/CHANGES.txt b/CHANGES.txt index 507a709aa2..dd5d22bb5c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -29,6 +29,7 @@ Merged from 2.2: * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) Merged from 2.1: + * Fix Stress profile parsing on Windows (CASSANDRA-10808) * Fix incremental repair hang when replica is down (CASSANDRA-10288) * Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768) * Add proper error handling to stream receiver (CASSANDRA-10774) diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java index 5228828015..8440e8e288 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java @@ -55,12 +55,7 @@ public class SettingsCommandUser extends SettingsCommand String yamlPath = options.profile.value(); File yamlFile = new File(yamlPath); - if (yamlFile.exists()) - { - yamlPath = "file:///" + yamlFile.getAbsolutePath(); - } - - profile = StressProfile.load(URI.create(yamlPath)); + profile = StressProfile.load(yamlFile.exists() ? yamlFile.toURI() : URI.create(yamlPath)); if (ratios.size() == 0) throw new IllegalArgumentException("Must specify at least one command with a non-zero ratio");