Commit 86ad68da authored by 吴晟's avatar 吴晟 Committed by 吴晟
Browse files

In no-init mode, should only check the index existence. (#4929)

parent ed6bcb91

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

+6 −5
Original line number Diff line number Diff line
@@ -53,11 +53,12 @@ public class StorageEsInstaller extends ModelInstaller { 
    protected boolean isExists(Model model) throws StorageException {

        ElasticSearchClient esClient = (ElasticSearchClient) client;

        try {

            String timeSeriesIndexName =

                model.isTimeSeries() ?

                    TimeSeriesUtils.latestWriteIndexName(model) :

                    model.getName();

            return esClient.isExistsTemplate(model.getName()) && esClient.isExistsIndex(timeSeriesIndexName);

            if (model.isTimeSeries()) {

                return esClient.isExistsTemplate(model.getName()) && esClient.isExistsIndex(

                    TimeSeriesUtils.latestWriteIndexName(model));

            } else {

                return esClient.isExistsIndex(model.getName());

            }

        } catch (IOException e) {

            throw new StorageException(e.getMessage());

        }