Commit f75b067b authored by 彭勇升 pengys's avatar 彭勇升 pengys Committed by 吴晟
Browse files

Table name and time bucket error (#900) 

* Get the MQ server address id from reference.

* Fixed the remote exception bug when running cluster mode collector.
How: Register remote data entity into remote module.

* Fixed the bug which the end second time bucket calculate result is incorrect.

* Fixed a test case error.
parent d04d8590

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/utils/TimePyramidTableNameBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class TimePyramidTableNameBuilder { 
                tableName = tableName + Const.ID_SPLIT + TimePyramid.Day.getName();

                break;

            case HOUR:

                tableName = tableName + Const.ID_SPLIT + TimePyramid.Day.getName();

                tableName = tableName + Const.ID_SPLIT + TimePyramid.Hour.getName();

                break;

            case MINUTE:

                tableName = tableName + Const.ID_SPLIT + TimePyramid.Minute.getName();

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceEsUIDAO.java

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ public class InstanceEsUIDAO extends EsDAO implements IInstanceUIDAO { 


        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();



        //TODO second

        BoolQueryBuilder timeBoolQuery = QueryBuilders.boolQuery();

        timeBoolQuery.should().add(QueryBuilders.rangeQuery(InstanceTable.COLUMN_REGISTER_TIME).gte(startSecondTimeBucket).lte(endSecondTimeBucket));

        timeBoolQuery.should().add(QueryBuilders.rangeQuery(InstanceTable.COLUMN_HEARTBEAT_TIME).gte(startSecondTimeBucket).lte(endSecondTimeBucket));
@@ -171,6 +172,7 @@ public class InstanceEsUIDAO extends EsDAO implements IInstanceUIDAO { 
        }

        boolQuery.must().add(QueryBuilders.termQuery(InstanceTable.COLUMN_IS_ADDRESS, BooleanUtils.FALSE));



        //TODO second

        BoolQueryBuilder timeBoolQuery = QueryBuilders.boolQuery();

        timeBoolQuery.should().add(QueryBuilders.rangeQuery(InstanceTable.COLUMN_REGISTER_TIME).gte(startSecondTimeBucket).lte(endSecondTimeBucket));

        timeBoolQuery.should().add(QueryBuilders.rangeQuery(InstanceTable.COLUMN_HEARTBEAT_TIME).gte(startSecondTimeBucket).lte(endSecondTimeBucket));
@@ -197,6 +199,7 @@ public class InstanceEsUIDAO extends EsDAO implements IInstanceUIDAO { 
        boolQuery.must().add(QueryBuilders.termQuery(InstanceTable.COLUMN_APPLICATION_ID, applicationId));

        boolQuery.must().add(QueryBuilders.termQuery(InstanceTable.COLUMN_IS_ADDRESS, BooleanUtils.FALSE));



        //TODO second

        BoolQueryBuilder timeBoolQuery = QueryBuilders.boolQuery();

        timeBoolQuery.should().add(QueryBuilders.rangeQuery(InstanceTable.COLUMN_REGISTER_TIME).gte(startSecondTimeBucket).lte(endSecondTimeBucket));

        timeBoolQuery.should().add(QueryBuilders.rangeQuery(InstanceTable.COLUMN_HEARTBEAT_TIME).gte(startSecondTimeBucket).lte(endSecondTimeBucket));

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/SegmentDurationEsUIDAO.java

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public class SegmentDurationEsUIDAO extends EsDAO implements ISegmentDurationUID 
        List<QueryBuilder> mustQueryList = boolQueryBuilder.must();



        if (startSecondTimeBucket != 0 && endSecondTimeBucket != 0) {

            //TODO second

            mustQueryList.add(QueryBuilders.rangeQuery(SegmentDurationTable.COLUMN_TIME_BUCKET).gte(startSecondTimeBucket).lte(endSecondTimeBucket));

        }

apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/AlarmQuery.java

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ public class AlarmQuery implements Query { 


    public Alarm loadAlarmList(String keyword, AlarmType alarmType, Duration duration,

        Pagination paging) throws ParseException {

        long startTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getStart()) / 100;

        long endTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getEnd()) / 100;

        long startTimeBucket = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(duration.getStep(), duration.getStart()) / 100;

        long endTimeBucket = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(duration.getStep(), duration.getEnd()) / 100;



        PaginationUtils.Page page = PaginationUtils.INSTANCE.exchange(paging);

apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ApplicationQuery.java

+8 −8
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ public class ApplicationQuery implements Query { 
    }



    public List<Application> getAllApplication(Duration duration) throws ParseException {

        long startSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getEnd());

        long startSecondTimeBucket = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(duration.getStep(), duration.getEnd());



        return getApplicationService().getApplications(startSecondTimeBucket, endSecondTimeBucket);

    }
@@ -79,8 +79,8 @@ public class ApplicationQuery implements Query { 
        long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart());

        long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd());



        long startSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getEnd());

        long startSecondTimeBucket = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(duration.getStep(), duration.getEnd());



        return getApplicationTopologyService().getApplicationTopology(duration.getStep(), applicationId, startTimeBucket, endTimeBucket, startSecondTimeBucket, endSecondTimeBucket);

    }
@@ -90,8 +90,8 @@ public class ApplicationQuery implements Query { 
        long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart());

        long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd());



        long startSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getEnd());

        long startSecondTimeBucket = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(duration.getStep(), duration.getEnd());



        return getApplicationService().getSlowService(applicationId, duration.getStep(), startTimeBucket, endTimeBucket, startSecondTimeBucket, endSecondTimeBucket, topN);

    }
@@ -101,8 +101,8 @@ public class ApplicationQuery implements Query { 
        long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart());

        long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd());



        long startSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(duration.getStep(), duration.getEnd());

        long startSecondTimeBucket = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(duration.getStep(), duration.getStart());

        long endSecondTimeBucket = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(duration.getStep(), duration.getEnd());



        return getServerService().getServerThroughput(applicationId, duration.getStep(), startTimeBucket, endTimeBucket, startSecondTimeBucket, endSecondTimeBucket, topN);

    }