You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/05/08 08:05:48 UTC

[skywalking] branch bug-ttl-es created (now 0a03794)

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a change to branch bug-ttl-es
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at 0a03794  Format index name with namespace

This branch includes the following new commits:

     new 0a03794  Format index name with namespace

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[skywalking] 01/01: Format index name with namespace

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch bug-ttl-es
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 0a03794486e9117f39292c5718a1f9aff0895649
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri May 8 16:04:56 2020 +0800

    Format index name with namespace
    
    Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
 .../server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
index 88ec7f8..ada4652 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java
@@ -66,7 +66,7 @@ public class HistoryDeleteEsDAO extends EsDAO implements IHistoryDeleteDAO {
         for (String prepareDeleteIndex : prepareDeleteIndexes) {
             client.deleteByIndexName(prepareDeleteIndex);
         }
-        String latestIndex = TimeSeriesUtils.latestWriteIndexName(model);
+        String latestIndex = client.formatIndexName(TimeSeriesUtils.latestWriteIndexName(model));
         if (!leftIndices.contains(latestIndex)) {
             client.createIndex(latestIndex);
         }