Renamed cassandra.yaml, read property list more robust

[sorenvind]

Read property strings more robust (strip spaces), rename cassandra.yaml to remove clash with default configuration file (cherry picked from commit dba83d9)

[sorenvind]

I don't see why SSTableLoaderWrapper is looking for the default included cassandra.yaml instead of the file actually configured to be the configuration file. You seem to have the IConfiguration available there, so why not use it (as in TuneCassandra.java)? Replace

URL url = this.getClass().getClassLoader().getResource("cassandra.yaml");
logger.info("Trying to load the yaml file from: " + url);
TuneCassandra.updateYaml(config, url.getPath(), "localhost", "org.apache.cassandra.locator.SimpleSeedProvider");

with (using the ConfigDir property from the other pull request)

TuneCassandra.updateYaml(config, config.getCassConfigDir() + "/cassandra.yaml", "localhost", "org.apache.cassandra.locator.SimpleSeedProvider");

In this way the configuration is at least consistent. Do let me know if there's something I'm missing.

[Vijay2win]

It is SSTableLoaderWrapper.java i am talking about Cassandra source code SSTableLoaderWrapper will start Cassandra by starting the MessagingService.

Cassandra.yaml in this directory is completely diffrent than the real cassandra.yaml file which will be in the config directory. We should not be messing with it for incremental restore.

[sorenvind]

I don't really follow how SSTableLoaderWrapper starts the MessagingService (it's not clear for me how this happens), but fair enough. I understand the need for having a different cassandra.yaml for the incremental restore.

Another possible approach that gets this problem out of the way: Use a config file with a different name (e.g. cassandra_priam_incremental_restore.yaml) for incremental restore, which could be included in Priam safely. EmbeddedServerHelper from Cassandra-Unit shows how this could be done. Since DatabaseDescriptor looks for the cassandra.config property this approach would also work in this case.

[sorenvind]

Looking at the cassandra properties being edited in EmbeddedServerHelper, I just noticed that they are not reversed to their original value after starting Cassandra. This should obviously be done after the incremental restore completes.

[sorenvind]

FYI: It seems that aryanet ran into exactly the same issue with the clashing cassandra.yaml files on the CP.

[sagarl]

Integrated code changes (commit 2048eb7) related to reading property string by stripping spaces.

Not sure if cassandra.yaml clashing issue still exist, if yes, please let us know.