StorageModuleElasticsearchProvider watches on wrong files?

[chanjarster]

I've noticed that StorageModuleElasticsearchProvider monitor two files config.getSecretsManagementFile(), config.getTrustStorePass() see below:

skywalking/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java

Lines 127 to 148 in 1acba5d

	MultipleFilesChangeMonitor monitor = new MultipleFilesChangeMonitor(
	10, readableContents -> {
	final byte[] secretsFileContent = readableContents.get(0);
	if (secretsFileContent == null) {
	return;
	}
	Properties secrets = new Properties();
	secrets.load(new ByteArrayInputStream(secretsFileContent));
	config.setUser(secrets.getProperty("user", null));
	config.setPassword(secrets.getProperty("password", null));
	config.setTrustStorePass(secrets.getProperty("trustStorePass", null));
	if (elasticSearchClient == null) {
	// In the startup process, we just need to change the username/password
	} else {
	// The client has connected, updates the config and connects again.
	elasticSearchClient.setUser(config.getUser());
	elasticSearchClient.setPassword(config.getPassword());
	elasticSearchClient.setTrustStorePass(config.getTrustStorePass());
	elasticSearchClient.connect();
	}
	}, config.getSecretsManagementFile(), config.getTrustStorePass());

Is the second parameter wrong? trustStorePass is not a file path, just a string for password.

[wu-sheng]

Yes, this should be removed. The TrustStorePass is in the management file.

[wu-sheng]

Could you submit a pull request to fix soon?

[chanjarster]

No problem, I think should replace TrustStorePass with TrustStorePath.

[wu-sheng]

Yes, it should be.

[wu-sheng]

Fixed by #8205