From 5437e436f43bd5710f1db4dbf80edafaa8876d23 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Thu, 1 Dec 2022 12:46:56 +0400 Subject: [PATCH 01/17] [th2-4262] Migrated to processor-core and book&page --- Dockerfile | 2 +- build.gradle | 38 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- .../th2/dataservice/healer/BoxMain.java | 125 ---------- .../dataservice/healer/cache/EventsCache.java | 101 -------- .../healer/cfg/HealerConfiguration.java | 55 ----- .../dataservice/healer/grpc/HealerImpl.java | 207 ---------------- .../exactpro/th2/processor/healer/Factory.kt | 45 ++++ .../th2/processor/healer/Processor.kt | 88 +++++++ .../exactpro/th2/processor/healer/Settings.kt | 28 +++ .../exactpro/th2/processor/healer/Utils.kt | 29 +++ .../dataservice/healer/EventsCacheTest.java | 53 ---- .../th2/dataservice/healer/HealerTest.java | 231 ------------------ src/test/kotlin/ProcessorTest.kt | 227 +++++++++++++++++ .../org.mockito.plugins.MockMaker | 1 + 15 files changed, 437 insertions(+), 795 deletions(-) delete mode 100644 src/main/java/com/exactpro/th2/dataservice/healer/BoxMain.java delete mode 100644 src/main/java/com/exactpro/th2/dataservice/healer/cache/EventsCache.java delete mode 100644 src/main/java/com/exactpro/th2/dataservice/healer/cfg/HealerConfiguration.java delete mode 100644 src/main/java/com/exactpro/th2/dataservice/healer/grpc/HealerImpl.java create mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt create mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt create mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt create mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt delete mode 100644 src/test/java/com/exactpro/th2/dataservice/healer/EventsCacheTest.java delete mode 100644 src/test/java/com/exactpro/th2/dataservice/healer/HealerTest.java create mode 100644 src/test/kotlin/ProcessorTest.kt create mode 100644 src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/Dockerfile b/Dockerfile index d313c84..4c2ff9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:6.8-jdk11 AS build +FROM gradle:7.6-jdk11 AS build ARG release_version ARG nexus_url ARG nexus_user diff --git a/build.gradle b/build.gradle index 718ffa0..d8e32d9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,11 @@ plugins { id 'com.palantir.docker' version '0.25.0' + id 'org.jetbrains.kotlin.jvm' version '1.6.21' + id 'org.jetbrains.kotlin.kapt' version "1.6.21" id 'java' - id 'java-library' id 'application' } -ext { - sharedDir = file("${project.rootDir}/shared") -} - group 'com.exactpro.th2' version release_version @@ -16,10 +13,6 @@ sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 repositories { - maven { - name 'MavenLocal' - url sharedDir - } mavenLocal() mavenCentral() maven { @@ -52,23 +45,26 @@ jar { } dependencies { - api platform('com.exactpro.th2:bom:3.0.0') + api platform('com.exactpro.th2:bom:4.0.2') + + compileOnly 'com.google.auto.service:auto-service:1.0.1' + kapt 'com.google.auto.service:auto-service:1.0.1' - implementation 'com.exactpro.th2:common:3.18.2' - implementation "com.exactpro.th2:grpc-crawler-data-processor:0.0.1" + implementation 'com.github.ben-manes.caffeine:caffeine:3.1.2' - implementation "com.exactpro.th2:cradle-cassandra:2.14.0" + implementation 'com.exactpro.th2:common:4.0.0-TH2-4262-reduce-load-book-and-page-3574992387-SNAPSHOT' + implementation "com.exactpro.th2:common-utils:0.0.1-book-and-page-3572891451-SNAPSHOT" + implementation "com.exactpro.th2:processor-core:0.1.0-TH2-4262-reduce-load-book-and-page-3575055063-d0fa0b3-SNAPSHOT" - implementation "org.slf4j:slf4j-log4j12" - implementation "org.slf4j:slf4j-api" - implementation 'junit:junit:4.13.1' + implementation "com.exactpro.th2:cradle-cassandra:4.0.0-dev-version-4-2548754188-SNAPSHOT" - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' + testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" + testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0" - testImplementation group: 'io.grpc', name: 'grpc-testing', version: '1.32.1' + testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.0" + testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.0" + testRuntimeOnly("org.junit.jupiter:junit-jupiter:5.9.0") - testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.11.2' } test { @@ -76,7 +72,7 @@ test { } application { - mainClassName 'com.exactpro.th2.healer.BoxMain' + mainClass.set('com.exactpro.th2.processor.MainKt') } applicationName = 'service' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/exactpro/th2/dataservice/healer/BoxMain.java b/src/main/java/com/exactpro/th2/dataservice/healer/BoxMain.java deleted file mode 100644 index 25f234c..0000000 --- a/src/main/java/com/exactpro/th2/dataservice/healer/BoxMain.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2020-2021 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.exactpro.th2.dataservice.healer; - -import com.exactpro.cradle.CradleStorage; -import com.exactpro.th2.dataservice.healer.cfg.HealerConfiguration; -import com.exactpro.th2.dataservice.healer.grpc.HealerImpl; -import com.exactpro.th2.common.schema.factory.CommonFactory; -import com.exactpro.th2.common.schema.grpc.router.GrpcRouter; -import io.grpc.Server; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Deque; -import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.ReentrantLock; - -import static com.exactpro.th2.common.metrics.CommonMetrics.setLiveness; -import static com.exactpro.th2.common.metrics.CommonMetrics.setReadiness; - -public class BoxMain { - - private static final Logger LOGGER = LoggerFactory.getLogger(BoxMain.class); - - public static void main(String[] args) { - Deque resources = new ConcurrentLinkedDeque<>(); - ReentrantLock lock = new ReentrantLock(); - Condition condition = lock.newCondition(); - - configureShutdownHook(resources, lock, condition); - try { - setLiveness(true); - - CommonFactory factory = CommonFactory.createFromArguments(args); - resources.add(factory); - - GrpcRouter grpcRouter = factory.getGrpcRouter(); - resources.add(grpcRouter); - - HealerConfiguration configuration = factory.getCustomConfiguration(HealerConfiguration.class); - CradleStorage storage = factory.getCradleManager().getStorage(); - - HealerImpl handler = new HealerImpl(configuration, storage); - - Server server = grpcRouter.startServer(handler).start(); - resources.add(() -> { - LOGGER.info("Shutting down Healer gRPC server"); - - TimeUnit unit = TimeUnit.SECONDS; - long timeout = 5L; - - if (server.shutdown().awaitTermination(timeout, unit)) { - LOGGER.warn("Cannot shutdown server in {} millis. Shutdown now", unit.toMillis(timeout)); - server.shutdownNow(); - } - }); - - setReadiness(true); - - LOGGER.info("Healer started"); - - awaitShutdown(lock, condition); - } catch (InterruptedException e) { - LOGGER.info("The main thread interrupted", e); - Thread.currentThread().interrupt(); - } catch (Exception e) { - LOGGER.error("Fatal error: " + e.getMessage(), e); - System.exit(1); - } - } - - private static void awaitShutdown(ReentrantLock lock, Condition condition) throws InterruptedException { - try { - lock.lock(); - LOGGER.info("Wait shutdown"); - condition.await(); - LOGGER.info("App shutdown"); - } finally { - lock.unlock(); - } - } - - private static void configureShutdownHook(Deque resources, ReentrantLock lock, Condition condition) { - Runtime.getRuntime().addShutdownHook(new Thread("Shutdown hook") { - @Override - public void run() { - LOGGER.info("Shutdown start"); - setReadiness(false); - try { - lock.lock(); - condition.signalAll(); - } finally { - lock.unlock(); - } - - resources.descendingIterator().forEachRemaining(resource -> { - try { - resource.close(); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - } - }); - setLiveness(false); - LOGGER.info("Shutdown end"); - } - }); - } - -} diff --git a/src/main/java/com/exactpro/th2/dataservice/healer/cache/EventsCache.java b/src/main/java/com/exactpro/th2/dataservice/healer/cache/EventsCache.java deleted file mode 100644 index 36bf775..0000000 --- a/src/main/java/com/exactpro/th2/dataservice/healer/cache/EventsCache.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2020-2021 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.exactpro.th2.dataservice.healer.cache; - -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -public class EventsCache extends LinkedHashMap { - private final int maxCapacity; - private final Lock writeLock; - private final Lock readLock; - - // These default values were taken from HashMap class - private static final int DEFAULT_INITIAL_CAPACITY = 16; - private static final float DEFAULT_LOAD_FACTOR = 0.75f; - - public EventsCache(int maxCapacity) { - super(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, true); - - if (maxCapacity <= 0) - throw new IllegalArgumentException("Capacity of EventsCache cannot be zero or negative"); - - this.maxCapacity = maxCapacity; - - ReadWriteLock lock = new ReentrantReadWriteLock(); - this.writeLock = lock.writeLock(); - this.readLock = lock.readLock(); - } - - @Override - public V get(Object key) { - try { - readLock.lock(); - return super.get(key); - } finally { - readLock.unlock(); - } - } - - @Override - public boolean containsKey(Object key) { - try { - readLock.lock(); - return super.containsKey(key); - } finally { - readLock.unlock(); - } - } - - @Override - public int size() { - try { - readLock.lock(); - return super.size(); - } finally { - readLock.unlock(); - } - } - - @Override - public V put(K key, V value) { - try { - writeLock.lock(); - return super.put(key, value); - } finally { - writeLock.unlock(); - } - } - - @Override - public V remove(Object key) { - try { - writeLock.lock(); - return super.remove(key); - } finally { - writeLock.unlock(); - } - } - - @Override - protected boolean removeEldestEntry(Map.Entry eldest) { - return size() > maxCapacity; - } -} diff --git a/src/main/java/com/exactpro/th2/dataservice/healer/cfg/HealerConfiguration.java b/src/main/java/com/exactpro/th2/dataservice/healer/cfg/HealerConfiguration.java deleted file mode 100644 index 7355366..0000000 --- a/src/main/java/com/exactpro/th2/dataservice/healer/cfg/HealerConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2020-2021 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.exactpro.th2.dataservice.healer.cfg; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.Objects; - -public class HealerConfiguration { - private final String name; - private final String version; - private final int maxCacheCapacity; - - @JsonCreator - public HealerConfiguration(@JsonProperty("name") String name, - @JsonProperty("version") String version, - @JsonProperty("maxCacheCapacity") int maxCacheCapacity) { - this.name = Objects.requireNonNull(name, "Name is required"); - this.version = Objects.requireNonNull(version, "Version is required"); - - if (name.trim().isEmpty()) { - throw new IllegalArgumentException("Name of Healer cannot be empty"); - } - - if (version.trim().isEmpty()) { - throw new IllegalArgumentException("Version of Healer cannot be empty"); - } - - if (maxCacheCapacity <= 0) - throw new IllegalArgumentException("Size of cache cannot be negative or zero"); - - this.maxCacheCapacity = maxCacheCapacity; - } - - public String getName() { return name; } - - public String getVersion() { return version; } - - public int getMaxCacheCapacity() { return maxCacheCapacity; } -} diff --git a/src/main/java/com/exactpro/th2/dataservice/healer/grpc/HealerImpl.java b/src/main/java/com/exactpro/th2/dataservice/healer/grpc/HealerImpl.java deleted file mode 100644 index b1aacbd..0000000 --- a/src/main/java/com/exactpro/th2/dataservice/healer/grpc/HealerImpl.java +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright 2020-2021 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.exactpro.th2.dataservice.healer.grpc; - -import com.exactpro.cradle.CradleStorage; -import com.exactpro.cradle.testevents.StoredTestEventId; -import com.exactpro.cradle.testevents.StoredTestEventWrapper; -import com.exactpro.th2.dataservice.healer.cache.EventsCache; -import com.exactpro.th2.dataservice.healer.cfg.HealerConfiguration; -import com.exactpro.th2.common.grpc.EventID; -import com.exactpro.th2.common.grpc.EventStatus; -import com.exactpro.th2.crawler.dataprocessor.grpc.CrawlerId; -import com.exactpro.th2.crawler.dataprocessor.grpc.CrawlerInfo; -import com.exactpro.th2.crawler.dataprocessor.grpc.DataProcessorGrpc; -import com.exactpro.th2.crawler.dataprocessor.grpc.DataProcessorInfo; -import com.exactpro.th2.crawler.dataprocessor.grpc.EventDataRequest; -import com.exactpro.th2.crawler.dataprocessor.grpc.EventResponse; -import com.exactpro.th2.crawler.dataprocessor.grpc.Status; -import com.exactpro.th2.dataprovider.grpc.EventData; -import io.grpc.stub.StreamObserver; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; - -import java.util.Collection; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.List; -import java.util.ArrayList; -import java.util.concurrent.ConcurrentHashMap; - -import static com.exactpro.th2.common.message.MessageUtils.toJson; - - -public class HealerImpl extends DataProcessorGrpc.DataProcessorImplBase { - - private static final Logger LOGGER = LoggerFactory.getLogger(HealerImpl.class); - - private final HealerConfiguration configuration; - private final CradleStorage storage; - private final Map cache; - private final Set knownCrawlers = ConcurrentHashMap.newKeySet(); - - public HealerImpl(HealerConfiguration configuration, CradleStorage storage) { - this.configuration = Objects.requireNonNull(configuration, "Configuration cannot be null"); - this.storage = Objects.requireNonNull(storage, "Cradle storage cannot be null"); - this.cache = new EventsCache<>(configuration.getMaxCacheCapacity()); - } - - @Override - public void crawlerConnect(CrawlerInfo request, StreamObserver responseObserver) { - try { - - if (LOGGER.isInfoEnabled()) { - LOGGER.info("crawlerConnect request: {}", toJson(request, true)); - } - - - knownCrawlers.add(request.getId()); - - DataProcessorInfo response = DataProcessorInfo.newBuilder() - .setName(configuration.getName()) - .setVersion(configuration.getVersion()) - .build(); - - if (LOGGER.isInfoEnabled()) { - LOGGER.info("crawlerConnect response: {}", toJson(response, true)); - } - - responseObserver.onNext(response); - responseObserver.onCompleted(); - } catch (Exception e) { - responseObserver.onError(e); - LOGGER.error("crawlerConnect error: " + e.getMessage(), e); - } - } - - @Override - public void sendEvent(EventDataRequest request, StreamObserver responseObserver) { - try { - if (LOGGER.isInfoEnabled()) { - LOGGER.info("sendEvent request: {}", toJson(request, true)); - } - - if (!knownCrawlers.contains(request.getId())) { - - if (LOGGER.isWarnEnabled()) { - LOGGER.warn("Received request from unknown crawler with id {}. Sending response with HandshakeRequired = true", toJson(request.getId(), true)); - } - - responseObserver.onNext(EventResponse.newBuilder() - .setStatus(Status.newBuilder().setHandshakeRequired(true)) - .build()); - responseObserver.onCompleted(); - return; - } - - int eventsCount = request.getEventDataCount(); - - heal(request.getEventDataList()); - - EventID lastEventId = null; - - if (eventsCount > 0) { - lastEventId = request.getEventDataList().get(eventsCount - 1).getEventId(); - } - - EventResponse.Builder builder = EventResponse.newBuilder(); - - if (lastEventId != null) { - builder.setId(lastEventId); - } - - EventResponse response = builder.build(); - - if (LOGGER.isInfoEnabled()) { - LOGGER.info("sendEvent response: {}", toJson(response, true)); - } - - responseObserver.onNext(response); - responseObserver.onCompleted(); - } catch (Exception e) { - responseObserver.onError(e); - LOGGER.error("sendEvent error: " + e, e); - } - } - - private void heal(Collection events) throws IOException { - List eventAncestors; - - for (EventData event: events) { - if (event.getSuccessful() == EventStatus.FAILED && event.hasParentEventId()) { - - eventAncestors = getAncestors(event); - - for (InnerEvent ancestor : eventAncestors) { - StoredTestEventWrapper ancestorEvent = ancestor.event; - - if (ancestor.success) { - storage.updateEventStatus(ancestorEvent, false); - ancestor.markFailed(); - LOGGER.info("Event {} healed", ancestorEvent.getId()); - } - } - } - } - } - - private List getAncestors(EventData event) throws IOException { - List eventAncestors = new ArrayList<>(); - String parentId = event.getParentEventId().getId(); - - while (parentId != null) { - InnerEvent innerEvent; - - if (cache.containsKey(parentId)) { - innerEvent = cache.get(parentId); - } else { - StoredTestEventWrapper parent = storage.getTestEvent(new StoredTestEventId(parentId)); - - innerEvent = new InnerEvent(parent, parent.isSuccess()); - cache.put(parentId, innerEvent); - } - - eventAncestors.add(innerEvent); - - if (!innerEvent.success) break; - - StoredTestEventId eventId = innerEvent.event.getParentId(); - - if (eventId == null) - break; - - parentId = eventId.toString(); - } - - return eventAncestors; - } - - private static class InnerEvent { - private final StoredTestEventWrapper event; - private volatile boolean success; - - private InnerEvent(StoredTestEventWrapper event, boolean success) { - this.event = event; - this.success = success; - } - - private void markFailed() { this.success = false; } - } -} diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt new file mode 100644 index 0000000..5361a53 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt @@ -0,0 +1,45 @@ +/* + * Copyright 2020-2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.exactpro.th2.processor.healer + +import com.exactpro.th2.common.grpc.EventID +import com.exactpro.th2.common.schema.factory.AbstractCommonFactory +import com.exactpro.th2.common.utils.event.EventBatcher +import com.exactpro.th2.processor.api.IProcessor +import com.exactpro.th2.processor.api.IProcessorFactory +import com.exactpro.th2.processor.api.IProcessorSettings +import com.google.auto.service.AutoService + +@Suppress("unused") +@AutoService(IProcessorFactory::class) +class Factory : IProcessorFactory { + override val settingsClass: Class = Settings::class.java + + override fun create( + commonFactory: AbstractCommonFactory, + eventBatcher: EventBatcher, + processorEventId: EventID, + settings: IProcessorSettings?, + state: ByteArray? + ): IProcessor { + settings?.let { + check(settings is Settings) { + "Settings type mismatch expected: ${Settings::class}, actual: ${settings::class}" + } + return Processor(commonFactory.cradleManager.storage, eventBatcher, settings) + }?: error("Settings can not be null") + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt new file mode 100644 index 0000000..6e4fad1 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt @@ -0,0 +1,88 @@ +/* + * Copyright 2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.exactpro.th2.processor.healer + +import com.exactpro.cradle.CradleStorage +import com.exactpro.cradle.testevents.StoredTestEventId +import com.exactpro.th2.common.grpc.Event +import com.exactpro.th2.common.grpc.EventID +import com.exactpro.th2.common.grpc.EventStatus +import com.exactpro.th2.common.utils.event.EventBatcher +import com.exactpro.th2.processor.api.IProcessor +import com.github.benmanes.caffeine.cache.Cache +import com.github.benmanes.caffeine.cache.Caffeine +import mu.KotlinLogging + +typealias EventBuilder = com.exactpro.th2.common.event.Event + +class Processor( + private val cradleStore: CradleStorage, + private val eventBatcher: EventBatcher, + configuration: Settings +) : IProcessor { + + private val statusCache: Cache = Caffeine.newBuilder() + .maximumSize(configuration.maxCacheCapacity.toLong()) + .build() + + override fun handle(intervalEventId: EventID, event: Event) { + if (event.status == EventStatus.SUCCESS || !event.hasParentId()) { + return + } + + var parentId: StoredTestEventId? = event.parentId.toStoredTestEventId() + while (parentId != null) { + if (statusCache.getIfPresent(parentId) === FAKE_OBJECT) { + K_LOGGER.debug { + "The $parentId has been already updated for ${event.id.toStoredTestEventId()} event id" + } + } else { + //FIXME: event can't be exist + val parentEvent = cradleStore.getTestEvent(parentId) + + parentId = if (parentEvent.isSuccess) { + cradleStore.updateEventStatus(parentEvent, false) + reportUpdateEvent(intervalEventId, parentEvent.id) + parentEvent.parentId + } else { + K_LOGGER.debug { + "The ${parentEvent.id} has already has failed status for ${event.id.toStoredTestEventId()} event id" + } + null + } + + statusCache.put(parentEvent.id, FAKE_OBJECT) + } + } + } + + override fun close() { + cradleStore.dispose() + } + + private fun reportUpdateEvent(intervalEventId: EventID, eventId: StoredTestEventId) { + // FIXME: Add link to updated event + eventBatcher.onEvent(EventBuilder.start() + .name("Updated status of $eventId") + .type("Update status") + .toProto(intervalEventId)) + } + + companion object { + private val K_LOGGER = KotlinLogging.logger {} + private val FAKE_OBJECT: Any = Object() + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt new file mode 100644 index 0000000..8f28bec --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt @@ -0,0 +1,28 @@ +/* + * Copyright 2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.exactpro.th2.processor.healer + +import com.exactpro.th2.processor.api.IProcessorSettings + +class Settings( + val maxCacheCapacity: Int = 1_024, +) : IProcessorSettings { + init { + require(maxCacheCapacity > 0) { + "Size of cache cannot be negative or zero" + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt new file mode 100644 index 0000000..0e6507a --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt @@ -0,0 +1,29 @@ +/* + * Copyright 2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.processor.healer + +import com.exactpro.cradle.BookId +import com.exactpro.cradle.testevents.StoredTestEventId +import com.exactpro.th2.common.grpc.EventID +import com.exactpro.th2.common.util.toInstant + +fun EventID.toStoredTestEventId(): StoredTestEventId = StoredTestEventId( + BookId(bookName), + scope, + startTimestamp.toInstant(), + id +) \ No newline at end of file diff --git a/src/test/java/com/exactpro/th2/dataservice/healer/EventsCacheTest.java b/src/test/java/com/exactpro/th2/dataservice/healer/EventsCacheTest.java deleted file mode 100644 index b4b6b0c..0000000 --- a/src/test/java/com/exactpro/th2/dataservice/healer/EventsCacheTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2020-2021 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.exactpro.th2.dataservice.healer; - -import com.exactpro.th2.dataservice.healer.cache.EventsCache; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -public class EventsCacheTest { - private final Map cache = new EventsCache<>(10); - - @BeforeEach - public void prepare() { - for (int i = 0; i < 11; i++) { - cache.put(String.valueOf(i), i); - } - } - - @Test - public void maxSizeTest() { assertEquals(cache.size(), 10); } - - @Test - public void firstElementRemoved() { assertFalse(cache.containsValue(0)); } - - @Test - public void accessedElementPutLast() { - cache.get("1"); - - cache.put(String.valueOf(12), 12); - - assertTrue(cache.containsKey("1"), () -> "Cache must contain 1 but doesn't: " + cache); - } -} diff --git a/src/test/java/com/exactpro/th2/dataservice/healer/HealerTest.java b/src/test/java/com/exactpro/th2/dataservice/healer/HealerTest.java deleted file mode 100644 index 560ba6a..0000000 --- a/src/test/java/com/exactpro/th2/dataservice/healer/HealerTest.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * Copyright 2020-2021 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.exactpro.th2.dataservice.healer; - -import com.exactpro.cradle.CradleStorage; -import com.exactpro.cradle.testevents.StoredTestEvent; -import com.exactpro.cradle.testevents.StoredTestEventId; -import com.exactpro.cradle.testevents.StoredTestEventWrapper; -import com.exactpro.cradle.testevents.TestEventToStore; -import com.exactpro.cradle.utils.CradleStorageException; -import com.exactpro.th2.common.grpc.EventID; -import com.exactpro.th2.common.grpc.EventStatus; -import com.exactpro.th2.crawler.dataprocessor.grpc.CrawlerId; -import com.exactpro.th2.crawler.dataprocessor.grpc.CrawlerInfo; -import com.exactpro.th2.crawler.dataprocessor.grpc.DataProcessorGrpc; -import com.exactpro.th2.crawler.dataprocessor.grpc.DataProcessorInfo; -import com.exactpro.th2.crawler.dataprocessor.grpc.EventDataRequest; -import com.exactpro.th2.crawler.dataprocessor.grpc.EventResponse; -import com.exactpro.th2.dataprovider.grpc.EventData; -import com.exactpro.th2.dataservice.healer.cfg.HealerConfiguration; -import com.exactpro.th2.dataservice.healer.grpc.HealerImpl; -import io.grpc.ManagedChannel; -import io.grpc.Server; -import io.grpc.inprocess.InProcessChannelBuilder; -import io.grpc.inprocess.InProcessServerBuilder; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class HealerTest { - - private static final String HEALER_NAME = "healer"; - private static final String HEALER_VERSION = "1"; - private static final String CRAWLER_NAME = "crawler"; - private static final String PARENT_EVENT_ID = "parent_event_id"; - private static final String CHILD_EVENT_ID = "child_event_id"; - private static final String GRANDCHILD_EVENT_ID = "grandchild_event_id"; - private static final HealerConfiguration CONFIGURATION = new HealerConfiguration(HEALER_NAME, HEALER_VERSION, 100); - private static final CrawlerId CRAWLER_ID = CrawlerId.newBuilder().setName(CRAWLER_NAME).build(); - private static final CrawlerInfo CRAWLER_INFO = CrawlerInfo.newBuilder().setId(CRAWLER_ID).build(); - private static final CradleStorage STORAGE_MOCK = mock(CradleStorage.class); - private static final List events = new ArrayList<>(); - - private static Server server; - private static ManagedChannel channel; - private static DataProcessorGrpc.DataProcessorBlockingStub blockingStub; - - @BeforeEach - public void prepare() throws IOException, CradleStorageException { - String serverName = InProcessServerBuilder.generateName(); - - server = InProcessServerBuilder.forName(serverName) - .addService(new HealerImpl(CONFIGURATION, STORAGE_MOCK)) - .build() - .start(); - channel = InProcessChannelBuilder.forName(serverName) - .usePlaintext() - .directExecutor() - .build(); - - blockingStub = DataProcessorGrpc.newBlockingStub(channel); - - when(STORAGE_MOCK.getTestEvent(any(StoredTestEventId.class))).then(invocation -> { - StoredTestEventId id = invocation.getArgument(0); - - for (StoredTestEventWrapper storedEvent : events) { - if (storedEvent.getId().toString().equals(id.toString())) - return storedEvent; - } - - return null; - }); - - createEvents(); - } - - @AfterEach - public void shutdown() { - server.shutdown(); - channel.shutdown(); - events.clear(); - } - - @Test - public void handshakeHandling() { - DataProcessorInfo dataServiceInfo = blockingStub.crawlerConnect(CRAWLER_INFO); - assertEquals(HEALER_NAME, dataServiceInfo.getName()); - assertEquals(HEALER_VERSION, dataServiceInfo.getVersion()); - } - - @Test - public void correctEventIdInResponse() { - EventID eventId1 = EventID.newBuilder().setId("event_id1").build(); - EventID eventId2 = EventID.newBuilder().setId("event_id2").build(); - - EventDataRequest request = EventDataRequest.newBuilder() - .setId(CRAWLER_INFO.getId()) - .addEventData(EventData.newBuilder().setEventId(eventId1).build()) - .addEventData(EventData.newBuilder().setEventId(eventId2).build()) - .build(); - - blockingStub.crawlerConnect(CRAWLER_INFO); - EventResponse response = blockingStub.sendEvent(request); - - assertEquals(eventId2.getId(), response.getId().getId()); - } - - @Test - public void healedCorrectly() throws IOException { - EventID parentId = EventID.newBuilder().setId(PARENT_EVENT_ID).build(); - EventID childId = EventID.newBuilder().setId(CHILD_EVENT_ID).build(); - EventID grandchildId = EventID.newBuilder().setId(GRANDCHILD_EVENT_ID).build(); - - EventData parentEvent = EventData.newBuilder() - .setEventId(parentId) - .setSuccessful(EventStatus.SUCCESS) - .build(); - - EventData childEvent = EventData.newBuilder() - .setEventId(childId) - .setParentEventId(parentId) - .setSuccessful(EventStatus.SUCCESS) - .build(); - - EventData grandchildEvent = EventData.newBuilder() - .setEventId(grandchildId) - .setParentEventId(childId) - .setSuccessful(EventStatus.FAILED) - .build(); - - EventDataRequest request = EventDataRequest.newBuilder() - .setId(CRAWLER_INFO.getId()) - .addEventData(parentEvent) - .addEventData(childEvent) - .addEventData(grandchildEvent) - .build(); - - blockingStub.crawlerConnect(CRAWLER_INFO); - blockingStub.sendEvent(request); - - verify(STORAGE_MOCK).updateEventStatus(events.get(0), false); - verify(STORAGE_MOCK).updateEventStatus(events.get(1), false); - } - - @Test - public void crawlerUnknown() { - EventResponse response = blockingStub.sendEvent(EventDataRequest.newBuilder() - .setId(CRAWLER_INFO.getId()) - .addEventData(EventData.getDefaultInstance()) - .build()); - - assertTrue(response.getStatus().getHandshakeRequired()); - } - - private void createEvents() throws CradleStorageException { - Instant instant = Instant.now(); - - TestEventToStore parentEventToStore = TestEventToStore.builder() - .startTimestamp(instant) - .endTimestamp(instant.plus(1, ChronoUnit.MINUTES)) - .name("parent_event_name") - .content(new byte[]{1, 2, 3}) - .id(new StoredTestEventId(PARENT_EVENT_ID)) - .success(true) - .type("event_type") - .success(true) - .build(); - - StoredTestEvent parentEventData = StoredTestEvent.newStoredTestEventSingle(parentEventToStore); - StoredTestEventWrapper parentEvent = new StoredTestEventWrapper(parentEventData); - - TestEventToStore childEventToStore = TestEventToStore.builder() - .startTimestamp(instant.plus(2, ChronoUnit.MINUTES)) - .endTimestamp(instant.plus(3, ChronoUnit.MINUTES)) - .name("child_event_name") - .content(new byte[]{1, 2, 3}) - .id(new StoredTestEventId("child_event_id")) - .parentId(new StoredTestEventId(PARENT_EVENT_ID)) - .success(true) - .type("event_type") - .build(); - - StoredTestEvent childEventData = StoredTestEvent.newStoredTestEventSingle(childEventToStore); - StoredTestEventWrapper childEvent = new StoredTestEventWrapper(childEventData); - - TestEventToStore grandchildEventToStore = TestEventToStore.builder() - .startTimestamp(instant.plus(4, ChronoUnit.MINUTES)) - .endTimestamp(instant.plus(5, ChronoUnit.MINUTES)) - .name("grandchild_event_name") - .content(new byte[]{1, 2, 3}) - .id(new StoredTestEventId(GRANDCHILD_EVENT_ID)) - .parentId(new StoredTestEventId(CHILD_EVENT_ID)) - .type("event_type") - .success(false) - .build(); - - StoredTestEvent grandchildEventData = StoredTestEvent.newStoredTestEventSingle(grandchildEventToStore); - StoredTestEventWrapper grandchildEvent = new StoredTestEventWrapper(grandchildEventData); - - events.add(parentEvent); - events.add(childEvent); - events.add(grandchildEvent); - } -} diff --git a/src/test/kotlin/ProcessorTest.kt b/src/test/kotlin/ProcessorTest.kt new file mode 100644 index 0000000..734e9f9 --- /dev/null +++ b/src/test/kotlin/ProcessorTest.kt @@ -0,0 +1,227 @@ +/* + * Copyright 2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.processor.healer + +import com.exactpro.cradle.BookId +import com.exactpro.cradle.PageId +import com.exactpro.cradle.cassandra.CassandraCradleStorage +import com.exactpro.cradle.testevents.StoredTestEventId +import com.exactpro.cradle.testevents.StoredTestEventSingle +import com.exactpro.th2.common.grpc.Event +import com.exactpro.th2.common.grpc.EventID +import com.exactpro.th2.common.grpc.EventStatus +import com.exactpro.th2.common.grpc.Message +import com.exactpro.th2.common.grpc.RawMessage +import com.exactpro.th2.common.utils.event.EventBatcher +import com.exactpro.th2.common.utils.message.toTimestamp +import com.exactpro.th2.processor.api.IProcessor +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.never +import org.mockito.kotlin.times +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever +import java.time.Instant +import kotlin.test.assertFailsWith + +class ProcessorTest { + private lateinit var cradleStorage: CassandraCradleStorage + private lateinit var eventBatcher: EventBatcher + private lateinit var processor: IProcessor + + @BeforeEach + fun beforeEach() { + cradleStorage = mock { } + eventBatcher = mock { } + + processor = Processor( + cradleStorage, + eventBatcher, + Settings() + ) + } + + @Test + fun `handle message`() { + assertFailsWith("Call unsupported expected overload") { + processor.handle(INTERVAL_EVENT_ID, Message.getDefaultInstance()) + } + } + + @Test + fun `handle raw message`() { + assertFailsWith("Call unsupported expected overload") { + processor.handle(INTERVAL_EVENT_ID, RawMessage.getDefaultInstance()) + } + } + + @Test + fun `doesn't heal success event`() { + val eventA = A_EVENT_ID.createSingleEvent(null, "A", true).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", true).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + + processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) + verify(cradleStorage, never().description("Load event")).getTestEvent(any()) + verify(cradleStorage, never().description("Update event")).updateEventStatus(any(), any()) + + verify(eventBatcher, never().description("Publish event")).onEvent(any()) + } + + @Test + fun `heal parent events until failed event`() { + val eventA = A_EVENT_ID.createSingleEvent(null, "A", false).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", true).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + val eventC = C_EVENT_ID.createSingleEvent(eventB.id, "C", true).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + val eventD = D_EVENT_ID.createSingleEvent(eventC.id, "D", false).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + + processor.handle(INTERVAL_EVENT_ID, eventD.toGrpcEvent()) + verify(cradleStorage, times(1).description("Load event A")).getTestEvent(eq(eventA.id)) + verify(cradleStorage, times(1).description("Load event B")).getTestEvent(eq(eventB.id)) + verify(cradleStorage, times(1).description("Load event C")).getTestEvent(eq(eventC.id)) + verify(cradleStorage, never().description("Load event D")).getTestEvent(eq(eventD.id)) + verify(cradleStorage, times(3).description("Load events")).getTestEvent(any()) + + verify(cradleStorage, never().description("Update event A")).updateEventStatus(eq(eventA), eq(false)) + verify(cradleStorage, times(1).description("Update event B")).updateEventStatus(eq(eventB), eq(false)) + verify(cradleStorage, times(1).description("Update event C")).updateEventStatus(eq(eventC), eq(false)) + verify(cradleStorage, never().description("Update event D")).updateEventStatus(eq(eventD), eq(false)) + verify(cradleStorage, times(2).description("Update events")).updateEventStatus(any(), any()) + + verify(eventBatcher, times(2).description("Publish event")).onEvent(any()) + } + + private fun StoredTestEventSingle.toGrpcEvent() = Event.newBuilder().apply { + id = this@toGrpcEvent.id.toGrpcEventId() + this@toGrpcEvent.parentId?.let { + parentId = it.toGrpcEventId() + } + name = this@toGrpcEvent.name + type = this@toGrpcEvent.type + status = if (this@toGrpcEvent.isSuccess) EventStatus.SUCCESS else EventStatus.FAILED + }.build() + + private fun StoredTestEventId.toGrpcEventId() = EventID.newBuilder().apply { + bookName = this@toGrpcEventId.bookId.name + scope = this@toGrpcEventId.scope + id = this@toGrpcEventId.id + startTimestamp = this@toGrpcEventId.startTimestamp.toTimestamp() + }.build() + + private fun String.createEventId() = StoredTestEventId( + BookId(BOOK_NAME), + SCOPE_NAME, + Instant.now(), + this + ) + + private fun String.createSingleEvent( + parentId: StoredTestEventId?, + description: String, + success: Boolean + ): StoredTestEventSingle { + val id = this.createEventId() + return StoredTestEventSingle( + id, + "$description name", + "$description type", + parentId, + null, + success, + ByteArray(10), + emptySet(), + PageId(id.bookId, PAGE_NAME), + null, + Instant.now() + ) + } + +// @Throws(CradleStorageException::class) +// private fun createEvents() { +// val instant = Instant.now() +// val parentEventToStore: TestEventToStore = TestEventToStore.builder() +// .startTimestamp(instant) +// .endTimestamp(instant.plus(1, ChronoUnit.MINUTES)) +// .name("parent_event_name") +// .content(byteArrayOf(1, 2, 3)) +// .id(StoredTestEventId(PARENT_EVENT_ID)) +// .success(true) +// .type("event_type") +// .success(true) +// .build() +// val parentEventData: StoredTestEvent = StoredTestEvent.newStoredTestEventSingle(parentEventToStore) +// val parentEvent = StoredTestEventWrapper(parentEventData) +// val childEventToStore: TestEventToStore = TestEventToStore.builder() +// .startTimestamp(instant.plus(2, ChronoUnit.MINUTES)) +// .endTimestamp(instant.plus(3, ChronoUnit.MINUTES)) +// .name("child_event_name") +// .content(byteArrayOf(1, 2, 3)) +// .id(StoredTestEventId("child_event_id")) +// .parentId(StoredTestEventId(PARENT_EVENT_ID)) +// .success(true) +// .type("event_type") +// .build() +// val childEventData: StoredTestEvent = StoredTestEvent.newStoredTestEventSingle(childEventToStore) +// val childEvent = StoredTestEventWrapper(childEventData) +// val grandchildEventToStore: TestEventToStore = TestEventToStore.builder() +// .startTimestamp(instant.plus(4, ChronoUnit.MINUTES)) +// .endTimestamp(instant.plus(5, ChronoUnit.MINUTES)) +// .name("grandchild_event_name") +// .content(byteArrayOf(1, 2, 3)) +// .id(StoredTestEventId(GRANDCHILD_EVENT_ID)) +// .parentId(StoredTestEventId(CHILD_EVENT_ID)) +// .type("event_type") +// .success(false) +// .build() +// val grandchildEventData: StoredTestEvent = StoredTestEvent.newStoredTestEventSingle(grandchildEventToStore) +// val grandchildEvent = StoredTestEventWrapper(grandchildEventData) +// events.add(parentEvent) +// events.add(childEvent) +// events.add(grandchildEvent) +// } + + companion object { + private const val BOOK_NAME = "book" + private const val PAGE_NAME = "page" + private const val SCOPE_NAME = "scope" + private const val A_EVENT_ID = "a_event_id" + private const val B_EVENT_ID = "b_event_id" + private const val C_EVENT_ID = "c_event_id" + private const val D_EVENT_ID = "d_event_id" + + private val INTERVAL_EVENT_ID = EventID.newBuilder().apply { + bookName = BOOK_NAME + scope = SCOPE_NAME + id = "interval event id" + startTimestamp = Instant.now().toTimestamp() + }.build() + } +} \ No newline at end of file diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 0000000..ca6ee9c --- /dev/null +++ b/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline \ No newline at end of file From 4f160121bf169093e7eaf80cb59d5a16afb18319 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Thu, 1 Dec 2022 14:23:42 +0400 Subject: [PATCH 02/17] [th2-4262] added `heal parent event twice` test --- .../th2/processor/healer/Processor.kt | 1 + src/test/kotlin/ProcessorTest.kt | 187 ++++++++++++------ 2 files changed, 124 insertions(+), 64 deletions(-) diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt index 6e4fad1..f9684a8 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt @@ -49,6 +49,7 @@ class Processor( K_LOGGER.debug { "The $parentId has been already updated for ${event.id.toStoredTestEventId()} event id" } + parentId = null } else { //FIXME: event can't be exist val parentEvent = cradleStore.getTestEvent(parentId) diff --git a/src/test/kotlin/ProcessorTest.kt b/src/test/kotlin/ProcessorTest.kt index 734e9f9..2cc508a 100644 --- a/src/test/kotlin/ProcessorTest.kt +++ b/src/test/kotlin/ProcessorTest.kt @@ -54,7 +54,7 @@ class ProcessorTest { processor = Processor( cradleStorage, eventBatcher, - Settings() + Settings(1) ) } @@ -82,10 +82,10 @@ class ProcessorTest { } processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) - verify(cradleStorage, never().description("Load event")).getTestEvent(any()) - verify(cradleStorage, never().description("Update event")).updateEventStatus(any(), any()) + verify(cradleStorage, never().description("Load events")).getTestEvent(any()) + verify(cradleStorage, never().description("Update events")).updateEventStatus(any(), any()) - verify(eventBatcher, never().description("Publish event")).onEvent(any()) + verify(eventBatcher, never().description("Publish events")).onEvent(any()) } @Test @@ -116,7 +116,106 @@ class ProcessorTest { verify(cradleStorage, never().description("Update event D")).updateEventStatus(eq(eventD), eq(false)) verify(cradleStorage, times(2).description("Update events")).updateEventStatus(any(), any()) - verify(eventBatcher, times(2).description("Publish event")).onEvent(any()) + verify(eventBatcher, times(2).description("Publish events")).onEvent(any()) + } + +// @Test // cache is drained asynchronously +// fun `eviction from cache`() { +// val eventA = A_EVENT_ID.createSingleEvent(null, "A", true).apply { +// whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) +// } +// val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", false).apply { +// whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) +// } +// +// val eventC = C_EVENT_ID.createSingleEvent(null, "C", true).apply { +// whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) +// } +// val eventD = D_EVENT_ID.createSingleEvent(eventC.id, "D", false).apply { +// whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) +// } +// +// processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) +// verify(cradleStorage, times(1).description("Load event A")).getTestEvent(eq(eventA.id)) +// verify(cradleStorage, times(1).description("Load events")).getTestEvent(any()) +// +// verify(cradleStorage, times(1).description("Update event A")).updateEventStatus(eq(eventA), eq(false)) +// verify(cradleStorage, times(1).description("Update events")).updateEventStatus(any(), any()) +// +// verify(eventBatcher, times(1).description("Publish events")).onEvent(any()) +// +// +// processor.handle(INTERVAL_EVENT_ID, eventD.toGrpcEvent()) +// verify(cradleStorage, times(1).description("Load event C")).getTestEvent(eq(eventC.id)) +// verify(cradleStorage, times(2).description("Load events")).getTestEvent(any()) +// +// verify(cradleStorage, times(1).description("Update event C")).updateEventStatus(eq(eventC), eq(false)) +// verify(cradleStorage, times(2).description("Update events")).updateEventStatus(any(), any()) +// +// verify(eventBatcher, times(2).description("Publish events")).onEvent(any()) +// +// val eventAUpdated = eventA.id.createSingleEvent(null, "A", false).apply { +// whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) +// } +// +// processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) +// verify(cradleStorage, times(1).description("Load updated event A")).getTestEvent(eq(eventAUpdated.id)) +// verify(cradleStorage, times(3).description("Load events")).getTestEvent(any()) +// +// verify(cradleStorage, times(2).description("Update events")).updateEventStatus(any(), any()) +// +// verify(eventBatcher, times(2).description("Publish events")).onEvent(any()) +// } + + @Test + fun `heal parent event twice`() { + val eventA = A_EVENT_ID.createSingleEvent(null, "A", true).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", false).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + val eventC = C_EVENT_ID.createSingleEvent(eventA.id, "C", false).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + + processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) + verify(cradleStorage, times(1).description("Load event A")).getTestEvent(eq(eventA.id)) + verify(cradleStorage, never().description("Load event B")).getTestEvent(eq(eventB.id)) + verify(cradleStorage, never().description("Load event C")).getTestEvent(eq(eventC.id)) + verify(cradleStorage, times(1).description("Load events")).getTestEvent(any()) + + verify(cradleStorage, times(1).description("Update event A")).updateEventStatus(eq(eventA), eq(false)) + verify(cradleStorage, times(1).description("Update events")).updateEventStatus(any(), any()) + + verify(eventBatcher, times(1).description("Publish event")).onEvent(any()) + + processor.handle(INTERVAL_EVENT_ID, eventC.toGrpcEvent()) + verify(cradleStorage, times(1).description("Load events")).getTestEvent(any()) + verify(cradleStorage, times(1).description("Update events")).updateEventStatus(any(), any()) + verify(eventBatcher, times(1).description("Publish event")).onEvent(any()) + } + + @Test + fun `heal failed event twice`() { + val eventA = A_EVENT_ID.createSingleEvent(null, "A", true).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", false).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + + repeat(2) { iteration -> + processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) + verify(cradleStorage, times(1).description("Load event A, iteration $iteration")).getTestEvent(eq(eventA.id)) + verify(cradleStorage, never().description("Load event B, iteration $iteration")).getTestEvent(eq(eventB.id)) + verify(cradleStorage, times(1).description("Load events, iteration $iteration")).getTestEvent(any()) + + verify(cradleStorage, times(1).description("Update event A, iteration $iteration")).updateEventStatus(eq(eventA), eq(false)) + verify(cradleStorage, times(1).description("Update events, iteration $iteration")).updateEventStatus(any(), any()) + + verify(eventBatcher, times(1).description("Publish event, iteration $iteration")).onEvent(any()) + } } private fun StoredTestEventSingle.toGrpcEvent() = Event.newBuilder().apply { @@ -147,66 +246,26 @@ class ProcessorTest { parentId: StoredTestEventId?, description: String, success: Boolean - ): StoredTestEventSingle { - val id = this.createEventId() - return StoredTestEventSingle( - id, - "$description name", - "$description type", - parentId, - null, - success, - ByteArray(10), - emptySet(), - PageId(id.bookId, PAGE_NAME), - null, - Instant.now() - ) - } + ): StoredTestEventSingle = this.createEventId() + .createSingleEvent(parentId, description, success) -// @Throws(CradleStorageException::class) -// private fun createEvents() { -// val instant = Instant.now() -// val parentEventToStore: TestEventToStore = TestEventToStore.builder() -// .startTimestamp(instant) -// .endTimestamp(instant.plus(1, ChronoUnit.MINUTES)) -// .name("parent_event_name") -// .content(byteArrayOf(1, 2, 3)) -// .id(StoredTestEventId(PARENT_EVENT_ID)) -// .success(true) -// .type("event_type") -// .success(true) -// .build() -// val parentEventData: StoredTestEvent = StoredTestEvent.newStoredTestEventSingle(parentEventToStore) -// val parentEvent = StoredTestEventWrapper(parentEventData) -// val childEventToStore: TestEventToStore = TestEventToStore.builder() -// .startTimestamp(instant.plus(2, ChronoUnit.MINUTES)) -// .endTimestamp(instant.plus(3, ChronoUnit.MINUTES)) -// .name("child_event_name") -// .content(byteArrayOf(1, 2, 3)) -// .id(StoredTestEventId("child_event_id")) -// .parentId(StoredTestEventId(PARENT_EVENT_ID)) -// .success(true) -// .type("event_type") -// .build() -// val childEventData: StoredTestEvent = StoredTestEvent.newStoredTestEventSingle(childEventToStore) -// val childEvent = StoredTestEventWrapper(childEventData) -// val grandchildEventToStore: TestEventToStore = TestEventToStore.builder() -// .startTimestamp(instant.plus(4, ChronoUnit.MINUTES)) -// .endTimestamp(instant.plus(5, ChronoUnit.MINUTES)) -// .name("grandchild_event_name") -// .content(byteArrayOf(1, 2, 3)) -// .id(StoredTestEventId(GRANDCHILD_EVENT_ID)) -// .parentId(StoredTestEventId(CHILD_EVENT_ID)) -// .type("event_type") -// .success(false) -// .build() -// val grandchildEventData: StoredTestEvent = StoredTestEvent.newStoredTestEventSingle(grandchildEventToStore) -// val grandchildEvent = StoredTestEventWrapper(grandchildEventData) -// events.add(parentEvent) -// events.add(childEvent) -// events.add(grandchildEvent) -// } + private fun StoredTestEventId.createSingleEvent( + parentId: StoredTestEventId?, + description: String, + success: Boolean + ): StoredTestEventSingle = StoredTestEventSingle( + this, + "$description name", + "$description type", + parentId, + null, + success, + ByteArray(10), + emptySet(), + PageId(bookId, PAGE_NAME), + null, + Instant.now() + ) companion object { private const val BOOK_NAME = "book" From 2d1b8d38552c64ecc2f746231fbdefc8b1d7172f Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Thu, 1 Dec 2022 18:18:18 +0400 Subject: [PATCH 03/17] [th2-4262] added logic to update unsubmitted interval --- .../th2/processor/healer/Processor.kt | 161 +++++++++++++++--- .../exactpro/th2/processor/healer/Settings.kt | 12 +- .../exactpro/th2/processor/healer/Utils.kt | 29 ---- src/test/kotlin/ProcessorTest.kt | 65 +++++-- 4 files changed, 195 insertions(+), 72 deletions(-) delete mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt index f9684a8..8d621f9 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt @@ -15,16 +15,22 @@ */ package com.exactpro.th2.processor.healer +import com.exactpro.cradle.BookId import com.exactpro.cradle.CradleStorage import com.exactpro.cradle.testevents.StoredTestEventId +import com.exactpro.th2.common.event.Event.Status.FAILED import com.exactpro.th2.common.grpc.Event import com.exactpro.th2.common.grpc.EventID import com.exactpro.th2.common.grpc.EventStatus +import com.exactpro.th2.common.util.toInstant import com.exactpro.th2.common.utils.event.EventBatcher import com.exactpro.th2.processor.api.IProcessor import com.github.benmanes.caffeine.cache.Cache import com.github.benmanes.caffeine.cache.Caffeine import mu.KotlinLogging +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit typealias EventBuilder = com.exactpro.th2.common.event.Event @@ -34,8 +40,17 @@ class Processor( configuration: Settings ) : IProcessor { + private val interval = configuration.updateUnsubmittedEventInterval + private val timeUtil = configuration.updateUnsubmittedEventTimeUnit + private val attempts = configuration.updateUnsubmittedEventAttempts + + private val executor = Executors.newScheduledThreadPool(1) + + private val unsubmittedEvents: MutableMap = ConcurrentHashMap() + private val statusCache: Cache = Caffeine.newBuilder() .maximumSize(configuration.maxCacheCapacity.toLong()) + .executor(executor) .build() override fun handle(intervalEventId: EventID, event: Event) { @@ -43,47 +58,143 @@ class Processor( return } - var parentId: StoredTestEventId? = event.parentId.toStoredTestEventId() - while (parentId != null) { - if (statusCache.getIfPresent(parentId) === FAKE_OBJECT) { - K_LOGGER.debug { - "The $parentId has been already updated for ${event.id.toStoredTestEventId()} event id" - } - parentId = null - } else { - //FIXME: event can't be exist - val parentEvent = cradleStore.getTestEvent(parentId) + heal( + intervalEventId, + event.id.toStoredTestEventId(), + event.parentId.toStoredTestEventId() + ) + } + + override fun close() { + // Processor factory doesn't close cradle storage + cradleStore.dispose() + executor.shutdown() + if (!executor.awaitTermination(1, TimeUnit.SECONDS)) { + K_LOGGER.warn { "Executor isn't shutdown during 1 sec" } + executor.shutdownNow() + } + } - parentId = if (parentEvent.isSuccess) { - cradleStore.updateEventStatus(parentEvent, false) - reportUpdateEvent(intervalEventId, parentEvent.id) - parentEvent.parentId + /** + * @return true if at least the first is healed + */ + private fun heal( + reportEventId: EventID, + childEventId: StoredTestEventId, + parentEventId: StoredTestEventId? + ): Boolean { + var sickEventId = parentEventId + var result = false + while (sickEventId != null) { + if (statusCache.getIfPresent(sickEventId) === FAKE_OBJECT) { + K_LOGGER.debug { "The $sickEventId has been already updated for $childEventId child event id" } + sickEventId = null + } else { + val parentEvent = cradleStore.getTestEvent(sickEventId) + if (parentEvent == null) { + val attempt = unsubmittedEvents.compute(sickEventId) { _, previous -> + when (val next = (previous ?: 0) + 1) { + attempts -> null + else -> next + } + } + when (attempt) { + null -> reportUnhealedEvent(reportEventId, sickEventId) + else -> { + scheduleHeal(reportEventId, childEventId, sickEventId) + reportUnsubmittedEvent(reportEventId, sickEventId, attempt) + } + } + sickEventId = null } else { - K_LOGGER.debug { - "The ${parentEvent.id} has already has failed status for ${event.id.toStoredTestEventId()} event id" + result = true + sickEventId = if (parentEvent.isSuccess) { + cradleStore.updateEventStatus(parentEvent, false) //FIXME: push sub-event for updated + reportUpdateEvent(reportEventId, parentEvent.id) + parentEvent.parentId + } else { + K_LOGGER.debug { + "The ${parentEvent.id} has already has failed status for $childEventId child event id" + } + null } - null + statusCache.put(parentEvent.id, FAKE_OBJECT) } - - statusCache.put(parentEvent.id, FAKE_OBJECT) } } + return result } - override fun close() { - cradleStore.dispose() + private fun scheduleHeal( + reportEventId: EventID, + eventId: StoredTestEventId, + sickEventId: StoredTestEventId + ) { + executor.schedule({ + runCatching { + heal(reportEventId, eventId, sickEventId) + }.onFailure { e -> + reportErrorEvent(reportEventId, sickEventId, e) + } + }, interval, timeUtil + ) + } + + private fun reportUnhealedEvent(reportEventId: EventID, eventId: StoredTestEventId) { + eventBatcher.onEvent( + EventBuilder.start() + .name( + "Heal of $eventId event failure after $attempts attempts with interval $interval $timeUtil" + ) + .type(EVENT_TYPE_UNSUBMITTED_EVENT) + .status(FAILED) + .toProto(reportEventId) + ) + } + + private fun reportErrorEvent(reportEventId: EventID, eventId: StoredTestEventId, e: Throwable) { + // FIXME: Add link to updated event + eventBatcher.onEvent( + EventBuilder.start() + .name("Heal of $eventId event failure") + .type(EVENT_TYPE_INTERNAL_ERROR) + .exception(e, true) + .status(FAILED) + .toProto(reportEventId) + ) + } + + private fun reportUnsubmittedEvent(intervalEventId: EventID, eventId: StoredTestEventId, attempt: Int) { + // FIXME: Add link to updated event + eventBatcher.onEvent( + EventBuilder.start() + .name("The $eventId hasn't been submitted to cradle yet, attempt $attempt") + .type(EVENT_TYPE_UNSUBMITTED_EVENT) + .toProto(intervalEventId) + ) } private fun reportUpdateEvent(intervalEventId: EventID, eventId: StoredTestEventId) { // FIXME: Add link to updated event - eventBatcher.onEvent(EventBuilder.start() - .name("Updated status of $eventId") - .type("Update status") - .toProto(intervalEventId)) + eventBatcher.onEvent( + EventBuilder.start() + .name("Updated status of $eventId") + .type("Update status") + .toProto(intervalEventId) + ) } companion object { private val K_LOGGER = KotlinLogging.logger {} private val FAKE_OBJECT: Any = Object() + private const val EVENT_TYPE_INTERNAL_ERROR: String = "Internal error" + private const val EVENT_TYPE_UNSUBMITTED_EVENT: String = "Unsubmitted event" + + fun EventID.toStoredTestEventId(): StoredTestEventId = StoredTestEventId( + BookId(bookName), + scope, + startTimestamp.toInstant(), + id + ) } } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt index 8f28bec..b30db37 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt @@ -16,13 +16,23 @@ package com.exactpro.th2.processor.healer import com.exactpro.th2.processor.api.IProcessorSettings +import java.util.concurrent.TimeUnit class Settings( val maxCacheCapacity: Int = 1_024, + val updateUnsubmittedEventInterval: Long = 1, + val updateUnsubmittedEventTimeUnit: TimeUnit = TimeUnit.SECONDS, + val updateUnsubmittedEventAttempts: Int = 100 ) : IProcessorSettings { init { require(maxCacheCapacity > 0) { - "Size of cache cannot be negative or zero" + "Size of cache cannot be negative or zero, actual $maxCacheCapacity" + } + require(updateUnsubmittedEventInterval > 0) { + "Update unsubmitted event interval cannot be negative or zero, actual $updateUnsubmittedEventInterval" + } + require(updateUnsubmittedEventAttempts > 0) { + "Update unsubmitted event attempts cannot be negative or zero, actual $updateUnsubmittedEventAttempts" } } } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt deleted file mode 100644 index 0e6507a..0000000 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2022 Exactpro (Exactpro Systems Limited) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.exactpro.th2.processor.healer - -import com.exactpro.cradle.BookId -import com.exactpro.cradle.testevents.StoredTestEventId -import com.exactpro.th2.common.grpc.EventID -import com.exactpro.th2.common.util.toInstant - -fun EventID.toStoredTestEventId(): StoredTestEventId = StoredTestEventId( - BookId(bookName), - scope, - startTimestamp.toInstant(), - id -) \ No newline at end of file diff --git a/src/test/kotlin/ProcessorTest.kt b/src/test/kotlin/ProcessorTest.kt index 2cc508a..25ec266 100644 --- a/src/test/kotlin/ProcessorTest.kt +++ b/src/test/kotlin/ProcessorTest.kt @@ -29,6 +29,7 @@ import com.exactpro.th2.common.grpc.RawMessage import com.exactpro.th2.common.utils.event.EventBatcher import com.exactpro.th2.common.utils.message.toTimestamp import com.exactpro.th2.processor.api.IProcessor +import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.kotlin.any @@ -39,6 +40,7 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import java.time.Instant +import java.util.concurrent.TimeUnit import kotlin.test.assertFailsWith class ProcessorTest { @@ -54,10 +56,16 @@ class ProcessorTest { processor = Processor( cradleStorage, eventBatcher, - Settings(1) + SETTINGS ) } + @AfterEach + fun afterEach() { + processor.close() + verify(cradleStorage, times(1).description("Dispose cradle storage")).dispose() + } + @Test fun `handle message`() { assertFailsWith("Call unsupported expected overload") { @@ -72,12 +80,34 @@ class ProcessorTest { } } + @Test + fun `unsubmitted event`() { + val eventA = A_EVENT_ID.toSingleEvent(null, "A", false) + val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", false).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + + processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) + + SETTINGS.updateUnsubmittedEventTimeUnit + .sleep(SETTINGS.updateUnsubmittedEventInterval * SETTINGS.updateUnsubmittedEventAttempts * 2) + + verify(cradleStorage, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load event A")) + .getTestEvent(eq(eventA.id)) + verify(cradleStorage, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load events")) + .getTestEvent(any()) + verify(cradleStorage, never().description("Update events")).updateEventStatus(any(), any()) + + verify(eventBatcher, times(SETTINGS.updateUnsubmittedEventAttempts).description("Publish events")) + .onEvent(any()) + } + @Test fun `doesn't heal success event`() { - val eventA = A_EVENT_ID.createSingleEvent(null, "A", true).apply { + val eventA = A_EVENT_ID.toSingleEvent(null, "A", true).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } - val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", true).apply { + val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", true).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } @@ -90,16 +120,16 @@ class ProcessorTest { @Test fun `heal parent events until failed event`() { - val eventA = A_EVENT_ID.createSingleEvent(null, "A", false).apply { + val eventA = A_EVENT_ID.toSingleEvent(null, "A", false).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } - val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", true).apply { + val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", true).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } - val eventC = C_EVENT_ID.createSingleEvent(eventB.id, "C", true).apply { + val eventC = C_EVENT_ID.toSingleEvent(eventB.id, "C", true).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } - val eventD = D_EVENT_ID.createSingleEvent(eventC.id, "D", false).apply { + val eventD = D_EVENT_ID.toSingleEvent(eventC.id, "D", false).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } @@ -169,13 +199,13 @@ class ProcessorTest { @Test fun `heal parent event twice`() { - val eventA = A_EVENT_ID.createSingleEvent(null, "A", true).apply { + val eventA = A_EVENT_ID.toSingleEvent(null, "A", true).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } - val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", false).apply { + val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", false).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } - val eventC = C_EVENT_ID.createSingleEvent(eventA.id, "C", false).apply { + val eventC = C_EVENT_ID.toSingleEvent(eventA.id, "C", false).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } @@ -198,10 +228,10 @@ class ProcessorTest { @Test fun `heal failed event twice`() { - val eventA = A_EVENT_ID.createSingleEvent(null, "A", true).apply { + val eventA = A_EVENT_ID.toSingleEvent(null, "A", true).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } - val eventB = B_EVENT_ID.createSingleEvent(eventA.id, "B", false).apply { + val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", false).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) } @@ -235,21 +265,21 @@ class ProcessorTest { startTimestamp = this@toGrpcEventId.startTimestamp.toTimestamp() }.build() - private fun String.createEventId() = StoredTestEventId( + private fun String.toEventId() = StoredTestEventId( BookId(BOOK_NAME), SCOPE_NAME, Instant.now(), this ) - private fun String.createSingleEvent( + private fun String.toSingleEvent( parentId: StoredTestEventId?, description: String, success: Boolean - ): StoredTestEventSingle = this.createEventId() - .createSingleEvent(parentId, description, success) + ): StoredTestEventSingle = this.toEventId() + .toSingleEvent(parentId, description, success) - private fun StoredTestEventId.createSingleEvent( + private fun StoredTestEventId.toSingleEvent( parentId: StoredTestEventId?, description: String, success: Boolean @@ -276,6 +306,7 @@ class ProcessorTest { private const val C_EVENT_ID = "c_event_id" private const val D_EVENT_ID = "d_event_id" + private val SETTINGS = Settings(1, 1, TimeUnit.MILLISECONDS, 3) private val INTERVAL_EVENT_ID = EventID.newBuilder().apply { bookName = BOOK_NAME scope = SCOPE_NAME From bff0176bacfc870bae89b4fb312930d6f752096b Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Thu, 1 Dec 2022 18:30:13 +0400 Subject: [PATCH 04/17] [th2-4262] added retry success for unsubmitted event --- src/test/kotlin/ProcessorTest.kt | 35 +++++++++++++++++++++++++++- src/test/resources/log4j2.properties | 29 +++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/test/resources/log4j2.properties diff --git a/src/test/kotlin/ProcessorTest.kt b/src/test/kotlin/ProcessorTest.kt index 25ec266..2c3ebaa 100644 --- a/src/test/kotlin/ProcessorTest.kt +++ b/src/test/kotlin/ProcessorTest.kt @@ -41,6 +41,8 @@ import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import java.time.Instant import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger +import kotlin.test.assertEquals import kotlin.test.assertFailsWith class ProcessorTest { @@ -81,7 +83,38 @@ class ProcessorTest { } @Test - fun `unsubmitted event`() { + fun `retry success for unsubmitted event`() { + val counter = AtomicInteger(SETTINGS.updateUnsubmittedEventAttempts) + val eventA = A_EVENT_ID.toSingleEvent(null, "A", true).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenAnswer { + if (counter.decrementAndGet() == 0) this else null + } + } + val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", false).apply { + whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) + } + + processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) + + SETTINGS.updateUnsubmittedEventTimeUnit + .sleep(SETTINGS.updateUnsubmittedEventInterval * SETTINGS.updateUnsubmittedEventAttempts * 2) + + assertEquals(0, counter.get(), "Requests to cradle storage mock") + verify(cradleStorage, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load event A")) + .getTestEvent(eq(eventA.id)) + verify(cradleStorage, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load events")) + .getTestEvent(any()) + verify(cradleStorage, times(1).description("Update event A")) + .updateEventStatus(eq(eventA), eq(false)) + verify(cradleStorage, times(1).description("Update events")) + .updateEventStatus(any(), any()) + + verify(eventBatcher, times(SETTINGS.updateUnsubmittedEventAttempts).description("Publish events")) + .onEvent(any()) + } + + @Test + fun `retry failure for unsubmitted event`() { val eventA = A_EVENT_ID.toSingleEvent(null, "A", false) val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", false).apply { whenever(cradleStorage.getTestEvent(eq(this.id))).thenReturn(this) diff --git a/src/test/resources/log4j2.properties b/src/test/resources/log4j2.properties new file mode 100644 index 0000000..2869db8 --- /dev/null +++ b/src/test/resources/log4j2.properties @@ -0,0 +1,29 @@ +# +# Copyright 2022 Exactpro (Exactpro Systems Limited) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +name=Th2Logger +# Console appender configuration +appender.console.type=Console +appender.console.name=consoleLogger +appender.console.layout.type=PatternLayout +appender.console.layout.pattern=%d{dd MMM yyyy HH:mm:ss,SSS} %-6p [%-15t] %c - %m%n +# Root logger level +rootLogger.level=INFO +# Root logger referring to console appender +rootLogger.appenderRef.stdout.ref=consoleLogger + +logger.th2.name=com.exactpro.th2 +logger.th2.level=DEBUG \ No newline at end of file From 7aaead6d327de4e328ab91103f640fe7bc7fd2e1 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Sat, 3 Dec 2022 08:36:19 +0400 Subject: [PATCH 05/17] [th2-4262] Implemented state --- .../exactpro/th2/processor/healer/Factory.kt | 4 +- .../th2/processor/healer/Processor.kt | 62 +++++++++++--- .../exactpro/th2/processor/healer/Utils.kt | 27 ++++++ .../th2/processor/healer/state/State.kt | 21 +++++ .../processor/healer/state/StateEventId.kt | 39 +++++++++ .../th2/processor/healer}/ProcessorTest.kt | 84 ++++++++++++++++++- 6 files changed, 221 insertions(+), 16 deletions(-) create mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt create mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/state/State.kt create mode 100644 src/main/kotlin/com/exactpro/th2/processor/healer/state/StateEventId.kt rename src/test/kotlin/{ => com/exactpro/th2/processor/healer}/ProcessorTest.kt (82%) diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt index 5361a53..a2c800a 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Exactpro (Exactpro Systems Limited) + * Copyright 2022 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ class Factory : IProcessorFactory { check(settings is Settings) { "Settings type mismatch expected: ${Settings::class}, actual: ${settings::class}" } - return Processor(commonFactory.cradleManager.storage, eventBatcher, settings) + return Processor(commonFactory.cradleManager.storage, eventBatcher, processorEventId, settings, state) }?: error("Settings can not be null") } } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt index 8d621f9..549a2d4 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt @@ -25,6 +25,8 @@ import com.exactpro.th2.common.grpc.EventStatus import com.exactpro.th2.common.util.toInstant import com.exactpro.th2.common.utils.event.EventBatcher import com.exactpro.th2.processor.api.IProcessor +import com.exactpro.th2.processor.healer.state.State +import com.exactpro.th2.processor.utility.OBJECT_MAPPER import com.github.benmanes.caffeine.cache.Cache import com.github.benmanes.caffeine.cache.Caffeine import mu.KotlinLogging @@ -37,7 +39,9 @@ typealias EventBuilder = com.exactpro.th2.common.event.Event class Processor( private val cradleStore: CradleStorage, private val eventBatcher: EventBatcher, - configuration: Settings + processorEventId: EventID, + configuration: Settings, + serializedState: ByteArray? ) : IProcessor { private val interval = configuration.updateUnsubmittedEventInterval @@ -53,6 +57,16 @@ class Processor( .executor(executor) .build() + init { + serializedState?.let { + OBJECT_MAPPER.readValue(it, State::class.java) + .unsubmittedEvents.forEach { stateEventId -> + val sickEventId = stateEventId.toStateEventId() + heal(processorEventId, null, sickEventId) + } + } + } + override fun handle(intervalEventId: EventID, event: Event) { if (event.status == EventStatus.SUCCESS || !event.hasParentId()) { return @@ -65,6 +79,12 @@ class Processor( ) } + override fun serializeState(): ByteArray? = if (unsubmittedEvents.isEmpty()) { + null + } else { + OBJECT_MAPPER.writeValueAsBytes(unsubmittedEvents.keys.toState()) + } + override fun close() { // Processor factory doesn't close cradle storage cradleStore.dispose() @@ -80,14 +100,14 @@ class Processor( */ private fun heal( reportEventId: EventID, - childEventId: StoredTestEventId, + childEventId: StoredTestEventId?, parentEventId: StoredTestEventId? ): Boolean { var sickEventId = parentEventId var result = false while (sickEventId != null) { if (statusCache.getIfPresent(sickEventId) === FAKE_OBJECT) { - K_LOGGER.debug { "The $sickEventId has been already updated for $childEventId child event id" } + K_LOGGER.debug { "The $sickEventId has been already updated${ childEventId?.let { " for $childEventId child event id" } ?: "" }" } sickEventId = null } else { val parentEvent = cradleStore.getTestEvent(sickEventId) @@ -100,21 +120,19 @@ class Processor( } when (attempt) { null -> reportUnhealedEvent(reportEventId, sickEventId) - else -> { - scheduleHeal(reportEventId, childEventId, sickEventId) - reportUnsubmittedEvent(reportEventId, sickEventId, attempt) - } + else -> scheduleHeal(reportEventId, childEventId, sickEventId, attempt) } sickEventId = null } else { result = true sickEventId = if (parentEvent.isSuccess) { - cradleStore.updateEventStatus(parentEvent, false) //FIXME: push sub-event for updated + cradleStore.updateEventStatus(parentEvent, false) //FIXME: push sub-event for updated, catch exception reportUpdateEvent(reportEventId, parentEvent.id) + unsubmittedEvents.remove(sickEventId) parentEvent.parentId } else { K_LOGGER.debug { - "The ${parentEvent.id} has already has failed status for $childEventId child event id" + "The ${parentEvent.id} has already has failed status${ childEventId?.let { " for $childEventId child event id" } ?: "" }" } null } @@ -127,17 +145,20 @@ class Processor( private fun scheduleHeal( reportEventId: EventID, - eventId: StoredTestEventId, - sickEventId: StoredTestEventId + childEventId: StoredTestEventId?, + sickEventId: StoredTestEventId, + attempt: Int ) { executor.schedule({ runCatching { - heal(reportEventId, eventId, sickEventId) + heal(reportEventId, childEventId, sickEventId) }.onFailure { e -> + K_LOGGER.error(e) { "Failure to heal $sickEventId event" } reportErrorEvent(reportEventId, sickEventId, e) } }, interval, timeUtil ) + reportUnsubmittedEvent(reportEventId, sickEventId, attempt) } private fun reportUnhealedEvent(reportEventId: EventID, eventId: StoredTestEventId) { @@ -149,6 +170,7 @@ class Processor( .type(EVENT_TYPE_UNSUBMITTED_EVENT) .status(FAILED) .toProto(reportEventId) + .log() ) } @@ -161,6 +183,7 @@ class Processor( .exception(e, true) .status(FAILED) .toProto(reportEventId) + .log() ) } @@ -171,6 +194,7 @@ class Processor( .name("The $eventId hasn't been submitted to cradle yet, attempt $attempt") .type(EVENT_TYPE_UNSUBMITTED_EVENT) .toProto(intervalEventId) + .log() ) } @@ -190,7 +214,19 @@ class Processor( private const val EVENT_TYPE_INTERNAL_ERROR: String = "Internal error" private const val EVENT_TYPE_UNSUBMITTED_EVENT: String = "Unsubmitted event" - fun EventID.toStoredTestEventId(): StoredTestEventId = StoredTestEventId( + private fun Event.log(): Event { + val func: () -> String = { + "Published event: name $name, type $type, status $status, body ${body.toStringUtf8()}" + } + when(status) { + EventStatus.SUCCESS -> K_LOGGER.info(func) + EventStatus.FAILED -> K_LOGGER.warn(func) + else -> K_LOGGER.error(func) + } + return this + } + + private fun EventID.toStoredTestEventId(): StoredTestEventId = StoredTestEventId( BookId(bookName), scope, startTimestamp.toInstant(), diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt new file mode 100644 index 0000000..54e74c4 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Utils.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.processor.healer + +import com.exactpro.cradle.testevents.StoredTestEventId +import com.exactpro.th2.processor.healer.state.State +import com.exactpro.th2.processor.healer.state.StateEventId + +fun StoredTestEventId.toStateEventId() = StateEventId(bookId.name, scope, startTimestamp, id) + +fun Set.toState(): State = State( + map { it.toStateEventId() } +) \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/state/State.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/state/State.kt new file mode 100644 index 0000000..a716405 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/state/State.kt @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.processor.healer.state + +data class State @JvmOverloads constructor( + val unsubmittedEvents: List = emptyList() +) diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/state/StateEventId.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/state/StateEventId.kt new file mode 100644 index 0000000..fe41ae0 --- /dev/null +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/state/StateEventId.kt @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Exactpro (Exactpro Systems Limited) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.exactpro.th2.processor.healer.state + +import com.exactpro.cradle.BookId +import com.exactpro.cradle.testevents.StoredTestEventId +import com.fasterxml.jackson.annotation.JsonProperty +import java.time.Instant + + +data class StateEventId( + @JsonProperty("book") val book: String, + @JsonProperty("scope") val scope: String, + @JsonProperty("timestamp") val timestamp: Instant, + @JsonProperty("id") val id: String +) { + init { + check(book.isNotBlank()) { "Book can't be blank, $this" } + check(scope.isNotBlank()) { "Scope can't be blank, $this" } + check(timestamp != Instant.MIN) { "Timestamp can't be equal as ${Instant.MIN}, $this" } + check(id.isNotBlank()) { "Id can't be blank, $this" } + } + + fun toStateEventId() = StoredTestEventId(BookId(book), scope, timestamp, id) +} diff --git a/src/test/kotlin/ProcessorTest.kt b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt similarity index 82% rename from src/test/kotlin/ProcessorTest.kt rename to src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt index 2c3ebaa..08c629f 100644 --- a/src/test/kotlin/ProcessorTest.kt +++ b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt @@ -29,6 +29,8 @@ import com.exactpro.th2.common.grpc.RawMessage import com.exactpro.th2.common.utils.event.EventBatcher import com.exactpro.th2.common.utils.message.toTimestamp import com.exactpro.th2.processor.api.IProcessor +import com.exactpro.th2.processor.healer.state.State +import com.exactpro.th2.processor.utility.OBJECT_MAPPER import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @@ -44,6 +46,8 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger import kotlin.test.assertEquals import kotlin.test.assertFailsWith +import kotlin.test.assertNotNull +import kotlin.test.assertNull class ProcessorTest { private lateinit var cradleStorage: CassandraCradleStorage @@ -58,7 +62,9 @@ class ProcessorTest { processor = Processor( cradleStorage, eventBatcher, - SETTINGS + PROCESSOR_EVENT_ID, + SETTINGS, + null ) } @@ -82,6 +88,72 @@ class ProcessorTest { } } + @Test + fun `store restore state`() { + val eventA = A_EVENT_ID.toSingleEvent(null, "A", true) + val eventB = B_EVENT_ID.toSingleEvent(eventA.id, "B", false) + + // Collect unsubmitted events + val cradleStorageA = mock { + on { getTestEvent(eq(eventB.id)) }.thenReturn(eventB) + } + val eventBatcherA = mock { } + val processorA = Processor( + cradleStorageA, + eventBatcherA, + PROCESSOR_EVENT_ID, + Settings( + updateUnsubmittedEventInterval = Long.MAX_VALUE, + updateUnsubmittedEventTimeUnit = TimeUnit.DAYS, + ), + null + ) + + processorA.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) + + verify(cradleStorageA, never().description("Update events")).updateEventStatus(any(), any()) + + verify(eventBatcherA, times(1).description("Publish events")).onEvent(any()) + + val state = assertNotNull(processorA.serializeState(), "Not empty state") + assertEquals(setOf(eventA.id).toState(), OBJECT_MAPPER.readValue(state, State::class.java), "State with A event") + + + // Restart processor and heal unsubmitted events again + val counter = AtomicInteger(SETTINGS.updateUnsubmittedEventAttempts) + val cradleStorageB = mock { + on { getTestEvent(eq(eventA.id)) }.thenAnswer { + if (counter.decrementAndGet() == 0) eventA else null + } + } + val eventBatcherB = mock { } + val processorB = Processor( + cradleStorageB, + eventBatcherB, + PROCESSOR_EVENT_ID, + SETTINGS, + state + ) + + SETTINGS.updateUnsubmittedEventTimeUnit + .sleep(SETTINGS.updateUnsubmittedEventInterval * SETTINGS.updateUnsubmittedEventAttempts * 2) + + assertEquals(0, counter.get(), "Requests to cradle storage mock") + verify(cradleStorageB, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load event A")) + .getTestEvent(eq(eventA.id)) + verify(cradleStorageB, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load events")) + .getTestEvent(any()) + verify(cradleStorageB, times(1).description("Update event A")) + .updateEventStatus(eq(eventA), eq(false)) + verify(cradleStorageB, times(1).description("Update events")) + .updateEventStatus(any(), any()) + + verify(eventBatcherB, times(SETTINGS.updateUnsubmittedEventAttempts).description("Publish events")) + .onEvent(any()) + + assertNull(processorB.serializeState(), "Empty state") + } + @Test fun `retry success for unsubmitted event`() { val counter = AtomicInteger(SETTINGS.updateUnsubmittedEventAttempts) @@ -111,6 +183,8 @@ class ProcessorTest { verify(eventBatcher, times(SETTINGS.updateUnsubmittedEventAttempts).description("Publish events")) .onEvent(any()) + + assertNull(processor.serializeState(), "Empty state") } @Test @@ -133,6 +207,8 @@ class ProcessorTest { verify(eventBatcher, times(SETTINGS.updateUnsubmittedEventAttempts).description("Publish events")) .onEvent(any()) + + assertNull(processor.serializeState(), "Empty state") } @Test @@ -340,6 +416,12 @@ class ProcessorTest { private const val D_EVENT_ID = "d_event_id" private val SETTINGS = Settings(1, 1, TimeUnit.MILLISECONDS, 3) + private val PROCESSOR_EVENT_ID = EventID.newBuilder().apply { + bookName = BOOK_NAME + scope = SCOPE_NAME + id = "processor event id" + startTimestamp = Instant.now().toTimestamp() + }.build() private val INTERVAL_EVENT_ID = EventID.newBuilder().apply { bookName = BOOK_NAME scope = SCOPE_NAME From fdc58a7435c5133d5759ae0e6ef46401dcdafd20 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Sun, 4 Dec 2022 10:15:40 +0400 Subject: [PATCH 06/17] [th2-4262] Extracted Event.log extension into core project --- build.gradle | 2 +- .../th2/processor/healer/Processor.kt | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index d8e32d9..1ffa080 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation 'com.exactpro.th2:common:4.0.0-TH2-4262-reduce-load-book-and-page-3574992387-SNAPSHOT' implementation "com.exactpro.th2:common-utils:0.0.1-book-and-page-3572891451-SNAPSHOT" - implementation "com.exactpro.th2:processor-core:0.1.0-TH2-4262-reduce-load-book-and-page-3575055063-d0fa0b3-SNAPSHOT" + implementation "com.exactpro.th2:processor-core:0.0.1-TH2-4262-reduce-load-book-and-page-3611999842-0e99701-SNAPSHOT" implementation "com.exactpro.th2:cradle-cassandra:4.0.0-dev-version-4-2548754188-SNAPSHOT" diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt index 549a2d4..3eae07d 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt @@ -27,6 +27,7 @@ import com.exactpro.th2.common.utils.event.EventBatcher import com.exactpro.th2.processor.api.IProcessor import com.exactpro.th2.processor.healer.state.State import com.exactpro.th2.processor.utility.OBJECT_MAPPER +import com.exactpro.th2.processor.utility.log import com.github.benmanes.caffeine.cache.Cache import com.github.benmanes.caffeine.cache.Caffeine import mu.KotlinLogging @@ -170,7 +171,7 @@ class Processor( .type(EVENT_TYPE_UNSUBMITTED_EVENT) .status(FAILED) .toProto(reportEventId) - .log() + .log(K_LOGGER) ) } @@ -183,7 +184,7 @@ class Processor( .exception(e, true) .status(FAILED) .toProto(reportEventId) - .log() + .log(K_LOGGER) ) } @@ -194,7 +195,7 @@ class Processor( .name("The $eventId hasn't been submitted to cradle yet, attempt $attempt") .type(EVENT_TYPE_UNSUBMITTED_EVENT) .toProto(intervalEventId) - .log() + .log(K_LOGGER) ) } @@ -214,18 +215,6 @@ class Processor( private const val EVENT_TYPE_INTERNAL_ERROR: String = "Internal error" private const val EVENT_TYPE_UNSUBMITTED_EVENT: String = "Unsubmitted event" - private fun Event.log(): Event { - val func: () -> String = { - "Published event: name $name, type $type, status $status, body ${body.toStringUtf8()}" - } - when(status) { - EventStatus.SUCCESS -> K_LOGGER.info(func) - EventStatus.FAILED -> K_LOGGER.warn(func) - else -> K_LOGGER.error(func) - } - return this - } - private fun EventID.toStoredTestEventId(): StoredTestEventId = StoredTestEventId( BookId(bookName), scope, From af89b2b6b07bb7cc55888d52587e29f09784d31e Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 6 Dec 2022 13:08:18 +0400 Subject: [PATCH 07/17] [ TH2-4504] Reuse scheduler from ProcessorContext --- build.gradle | 2 +- .../exactpro/th2/processor/healer/Factory.kt | 48 ++++++++++++------ .../th2/processor/healer/Processor.kt | 20 ++------ .../th2/processor/healer/ProcessorTest.kt | 49 +++++++++---------- 4 files changed, 60 insertions(+), 59 deletions(-) diff --git a/build.gradle b/build.gradle index 1ffa080..ae84b1d 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation 'com.exactpro.th2:common:4.0.0-TH2-4262-reduce-load-book-and-page-3574992387-SNAPSHOT' implementation "com.exactpro.th2:common-utils:0.0.1-book-and-page-3572891451-SNAPSHOT" - implementation "com.exactpro.th2:processor-core:0.0.1-TH2-4262-reduce-load-book-and-page-3611999842-0e99701-SNAPSHOT" + implementation "com.exactpro.th2:processor-core:0.0.1-TH2-4262-reduce-load-book-and-page-3627816228-ffc970b-SNAPSHOT" implementation "com.exactpro.th2:cradle-cassandra:4.0.0-dev-version-4-2548754188-SNAPSHOT" diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt index a2c800a..077af90 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt @@ -15,31 +15,47 @@ */ package com.exactpro.th2.processor.healer -import com.exactpro.th2.common.grpc.EventID -import com.exactpro.th2.common.schema.factory.AbstractCommonFactory -import com.exactpro.th2.common.utils.event.EventBatcher +import com.exactpro.th2.common.event.Event import com.exactpro.th2.processor.api.IProcessor import com.exactpro.th2.processor.api.IProcessorFactory import com.exactpro.th2.processor.api.IProcessorSettings +import com.exactpro.th2.processor.api.ProcessorContext +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.module.SimpleModule import com.google.auto.service.AutoService +import java.time.Instant @Suppress("unused") @AutoService(IProcessorFactory::class) class Factory : IProcessorFactory { - override val settingsClass: Class = Settings::class.java + override fun registerModules(objectMapper: ObjectMapper) { + with(objectMapper) { + registerModule(SimpleModule().addAbstractTypeMapping(IProcessorSettings::class.java, Settings::class.java)) + } + } - override fun create( - commonFactory: AbstractCommonFactory, - eventBatcher: EventBatcher, - processorEventId: EventID, - settings: IProcessorSettings?, - state: ByteArray? - ): IProcessor { - settings?.let { - check(settings is Settings) { - "Settings type mismatch expected: ${Settings::class}, actual: ${settings::class}" + override fun create(context: ProcessorContext): IProcessor { + with(context) { + requireNotNull(settings) { + "Settings can not be null" + }.let { settings -> + check(settings is Settings) { + "Settings type mismatch expected: ${Settings::class}, actual: ${settings::class}" + } + return Processor( + commonFactory.cradleManager.storage, + scheduler, + eventBatcher, + processorEventId, + settings, + state + ) } - return Processor(commonFactory.cradleManager.storage, eventBatcher, processorEventId, settings, state) - }?: error("Settings can not be null") + } } + + override fun createProcessorEvent(): Event = Event.start() + .name("Healer event data processor ${Instant.now()}") + .description("Will contain all events with errors and information about processed events") + .type("Microservice") } \ No newline at end of file diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt index 3eae07d..3f24361 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Processor.kt @@ -32,13 +32,13 @@ import com.github.benmanes.caffeine.cache.Cache import com.github.benmanes.caffeine.cache.Caffeine import mu.KotlinLogging import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit +import java.util.concurrent.ScheduledExecutorService typealias EventBuilder = com.exactpro.th2.common.event.Event class Processor( private val cradleStore: CradleStorage, + private val scheduler: ScheduledExecutorService, private val eventBatcher: EventBatcher, processorEventId: EventID, configuration: Settings, @@ -49,13 +49,11 @@ class Processor( private val timeUtil = configuration.updateUnsubmittedEventTimeUnit private val attempts = configuration.updateUnsubmittedEventAttempts - private val executor = Executors.newScheduledThreadPool(1) - private val unsubmittedEvents: MutableMap = ConcurrentHashMap() private val statusCache: Cache = Caffeine.newBuilder() .maximumSize(configuration.maxCacheCapacity.toLong()) - .executor(executor) + .executor(scheduler) .build() init { @@ -86,15 +84,7 @@ class Processor( OBJECT_MAPPER.writeValueAsBytes(unsubmittedEvents.keys.toState()) } - override fun close() { - // Processor factory doesn't close cradle storage - cradleStore.dispose() - executor.shutdown() - if (!executor.awaitTermination(1, TimeUnit.SECONDS)) { - K_LOGGER.warn { "Executor isn't shutdown during 1 sec" } - executor.shutdownNow() - } - } + override fun close() { } /** * @return true if at least the first is healed @@ -150,7 +140,7 @@ class Processor( sickEventId: StoredTestEventId, attempt: Int ) { - executor.schedule({ + scheduler.schedule({ runCatching { heal(reportEventId, childEventId, sickEventId) }.onFailure { e -> diff --git a/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt index 08c629f..b47bb2f 100644 --- a/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt +++ b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt @@ -32,9 +32,9 @@ import com.exactpro.th2.processor.api.IProcessor import com.exactpro.th2.processor.healer.state.State import com.exactpro.th2.processor.utility.OBJECT_MAPPER import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.kotlin.any +import org.mockito.kotlin.doAnswer import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.never @@ -42,6 +42,8 @@ import org.mockito.kotlin.times import org.mockito.kotlin.verify import org.mockito.kotlin.whenever import java.time.Instant +import java.util.concurrent.ScheduledExecutorService +import java.util.concurrent.ScheduledFuture import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger import kotlin.test.assertEquals @@ -50,28 +52,28 @@ import kotlin.test.assertNotNull import kotlin.test.assertNull class ProcessorTest { - private lateinit var cradleStorage: CassandraCradleStorage - private lateinit var eventBatcher: EventBatcher - private lateinit var processor: IProcessor - - @BeforeEach - fun beforeEach() { - cradleStorage = mock { } - eventBatcher = mock { } - - processor = Processor( - cradleStorage, - eventBatcher, - PROCESSOR_EVENT_ID, - SETTINGS, - null - ) + private val cradleStorage: CassandraCradleStorage = mock { } + private val schedulerImmediateExecute: ScheduledExecutorService = mock { + on { schedule(any(), any(), any()) }.doAnswer { invocation -> + (invocation.arguments[0] as Runnable).run() + return@doAnswer mock> { } + } } + private val schedulerNeverExecute: ScheduledExecutorService = mock { } + private val eventBatcher: EventBatcher = mock { } + private val processor: IProcessor = Processor( + cradleStorage, + schedulerImmediateExecute, + eventBatcher, + PROCESSOR_EVENT_ID, + SETTINGS, + null + ) + @AfterEach fun afterEach() { processor.close() - verify(cradleStorage, times(1).description("Dispose cradle storage")).dispose() } @Test @@ -100,6 +102,7 @@ class ProcessorTest { val eventBatcherA = mock { } val processorA = Processor( cradleStorageA, + schedulerNeverExecute, eventBatcherA, PROCESSOR_EVENT_ID, Settings( @@ -129,15 +132,13 @@ class ProcessorTest { val eventBatcherB = mock { } val processorB = Processor( cradleStorageB, + schedulerImmediateExecute, eventBatcherB, PROCESSOR_EVENT_ID, SETTINGS, state ) - SETTINGS.updateUnsubmittedEventTimeUnit - .sleep(SETTINGS.updateUnsubmittedEventInterval * SETTINGS.updateUnsubmittedEventAttempts * 2) - assertEquals(0, counter.get(), "Requests to cradle storage mock") verify(cradleStorageB, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load event A")) .getTestEvent(eq(eventA.id)) @@ -168,9 +169,6 @@ class ProcessorTest { processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) - SETTINGS.updateUnsubmittedEventTimeUnit - .sleep(SETTINGS.updateUnsubmittedEventInterval * SETTINGS.updateUnsubmittedEventAttempts * 2) - assertEquals(0, counter.get(), "Requests to cradle storage mock") verify(cradleStorage, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load event A")) .getTestEvent(eq(eventA.id)) @@ -196,9 +194,6 @@ class ProcessorTest { processor.handle(INTERVAL_EVENT_ID, eventB.toGrpcEvent()) - SETTINGS.updateUnsubmittedEventTimeUnit - .sleep(SETTINGS.updateUnsubmittedEventInterval * SETTINGS.updateUnsubmittedEventAttempts * 2) - verify(cradleStorage, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load event A")) .getTestEvent(eq(eventA.id)) verify(cradleStorage, times(SETTINGS.updateUnsubmittedEventAttempts).description("Load events")) From 76bed183cf2155e69d3683cfa45e4d031b85577b Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 6 Dec 2022 15:14:45 +0400 Subject: [PATCH 08/17] [TH2-4504] Corrected GitHub actions --- .github/workflows/ci-unwelcome-words.yml | 2 +- .github/workflows/dev-docker-publish.yml | 32 +++++++++++++----------- .github/workflows/docker-publish.yml | 24 ++++++++---------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml index a369f6e..06dbda0 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.github/workflows/ci-unwelcome-words.yml @@ -7,7 +7,7 @@ jobs: test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.sha }} - name: Checkout tool diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/dev-docker-publish.yml index a1f0711..7ad5102 100644 --- a/.github/workflows/dev-docker-publish.yml +++ b/.github/workflows/dev-docker-publish.yml @@ -5,43 +5,47 @@ on: branches-ignore: - master - version-* +# paths: +# - gradle.properties +# - package_info.json jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Prepare custom build version - name: Get branch name id: branch - run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/} + run: echo "branch_name=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT + - name: Get SHA of the commit + id: sha + run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Get release_version id: ver - uses: christian-draeger/read-properties@1.0.1 + uses: christian-draeger/read-properties@1.1.1 with: path: gradle.properties - property: release_version + properties: release_version - name: Build custom release version id: release_ver - run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}" + run: echo value="${{ steps.ver.outputs.release_version }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}-${{ steps.sha.outputs.sha_short }}" >> $GITHUB_OUTPUT - name: Show custom release version run: echo ${{ steps.release_ver.outputs.value }} # Build and publish image - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - uses: docker/login-action@v1 + uses: docker/setup-buildx-action@v2 + - uses: docker/login-action@v2 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT id: meta - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: push: true tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }} - labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }} - build-args: | - release_version=${{ steps.release_ver.outputs.value }} \ No newline at end of file + labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }} \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 5e8229e..e529cdb 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -12,28 +12,26 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - uses: docker/login-action@v1 + uses: docker/setup-buildx-action@v2 + - uses: docker/login-action@v2 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.CR_PAT }} - - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT id: meta - name: Read version from gradle.properties id: read_property - uses: christian-draeger/read-properties@1.0.1 + uses: christian-draeger/read-properties@1.1.1 with: path: ./gradle.properties - property: release_version + properties: release_version - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: push: true - tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.value }} - labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.value }} - build-args: | - release_version=${{ steps.read_property.outputs.value }} \ No newline at end of file + tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.release_version }} + labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.release_version }} \ No newline at end of file From e744e40de469151db14a43f57845a119612027a9 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 20 Dec 2022 14:16:26 +0400 Subject: [PATCH 09/17] [TH2-4504] Updated processor-core --- build.gradle | 4 ++-- src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt | 4 ++-- src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ae84b1d..9750442 100644 --- a/build.gradle +++ b/build.gradle @@ -54,12 +54,12 @@ dependencies { implementation 'com.exactpro.th2:common:4.0.0-TH2-4262-reduce-load-book-and-page-3574992387-SNAPSHOT' implementation "com.exactpro.th2:common-utils:0.0.1-book-and-page-3572891451-SNAPSHOT" - implementation "com.exactpro.th2:processor-core:0.0.1-TH2-4262-reduce-load-book-and-page-3627816228-ffc970b-SNAPSHOT" + implementation "com.exactpro.th2:processor-core:0.0.1-TH2-4262-reduce-load-book-and-page-3739179455-7524a15-SNAPSHOT" implementation "com.exactpro.th2:cradle-cassandra:4.0.0-dev-version-4-2548754188-SNAPSHOT" testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" - testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0" + testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0' testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.0" testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.0" diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt index 077af90..e4ee726 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Factory.kt @@ -28,8 +28,8 @@ import java.time.Instant @Suppress("unused") @AutoService(IProcessorFactory::class) class Factory : IProcessorFactory { - override fun registerModules(objectMapper: ObjectMapper) { - with(objectMapper) { + override fun registerModules(configureMapper: ObjectMapper) { + with(configureMapper) { registerModule(SimpleModule().addAbstractTypeMapping(IProcessorSettings::class.java, Settings::class.java)) } } diff --git a/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt b/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt index b30db37..cb35a59 100644 --- a/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt +++ b/src/main/kotlin/com/exactpro/th2/processor/healer/Settings.kt @@ -18,7 +18,7 @@ package com.exactpro.th2.processor.healer import com.exactpro.th2.processor.api.IProcessorSettings import java.util.concurrent.TimeUnit -class Settings( +data class Settings( val maxCacheCapacity: Int = 1_024, val updateUnsubmittedEventInterval: Long = 1, val updateUnsubmittedEventTimeUnit: TimeUnit = TimeUnit.SECONDS, From 876e5c8522985617ce5cd63c8d8164f63c3e0941 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 20 Dec 2022 14:16:26 +0400 Subject: [PATCH 10/17] [TH2-4504] Updated processor-core --- README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 337dae9..df64e63 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ has a "success" status, the status of the parent is wrong. Healer finds the pare ## Configuration -There is an example of full configuration for the data processor +There is an example of full configuration (infra-2.0) for the data processor ```yaml apiVersion: th2.exactpro.com/v1 @@ -21,8 +21,18 @@ spec: version: 1.0.0 maxCacheCapacity: 1000 pins: - - name: server - connection-type: grpc + grpc: + client: + - name: to_data_provider + service-class: com.exactpro.th2.dataprovider.lw.grpc.DataProviderService + linkTo: + - box: lw-data-provider + pin: server + - name: to_data_provider_stream + service-class: com.exactpro.th2.dataprovider.lw.grpc.QueueDataProviderService + linkTo: + - box: lw-data-provider + pin: server extended-settings: service: enabled: true From 2b433a2296248293a53ffdaf613aaaacf194a80e Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 20 Dec 2022 18:24:03 +0400 Subject: [PATCH 11/17] [TH2-4504] Updated README.md --- README.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df64e63..cbb9802 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,22 @@ spec: image-version: type: th2-conn custom-config: - name: test-event-healer - version: 1.0.0 - maxCacheCapacity: 1000 + stateSessionAlias: my-processor-state + enableStoreState: false + from: 2021-06-16T12:00:00.00Z + to: 2021-06-17T14:00:00.00Z + intervalLength: PT10M + syncInterval: PT10M + awaitTimeout: 10 + awaitUnit: SECONDS + events: + bookToScope: + book1: [] + book2: [] + processorSettings: + name: test-event-healer + version: 1.0.0 + maxCacheCapacity: 1000 pins: grpc: client: From cfca8105d23dcdf6e7de0a58df6ad869491d93e4 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 13 Nov 2024 17:14:31 +0400 Subject: [PATCH 12/17] [TH2-5254] Updated gradle to 8.11 --- Dockerfile | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 282 ++++++++++++++--------- gradlew.bat | 35 +-- 5 files changed, 196 insertions(+), 127 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c2ff9e..3329c30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:7.6-jdk11 AS build +FROM gradle:8.11-jdk11 AS build ARG release_version ARG nexus_url ARG nexus_user diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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

K7UpUK$>l@ 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 E2O(~oYXATM diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From d64f390dfaf005f1ddbd63e095ce99d0da5a788f Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 13 Nov 2024 17:14:52 +0400 Subject: [PATCH 13/17] [TH2-5254] Updated dependencies --- build.gradle | 71 ++++++------------- .../th2/processor/healer/ProcessorTest.kt | 9 +-- 2 files changed, 27 insertions(+), 53 deletions(-) diff --git a/build.gradle b/build.gradle index 9750442..7dbe4be 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,18 @@ plugins { - id 'com.palantir.docker' version '0.25.0' - id 'org.jetbrains.kotlin.jvm' version '1.6.21' - id 'org.jetbrains.kotlin.kapt' version "1.6.21" - id 'java' - id 'application' + id "application" + id "org.jetbrains.kotlin.jvm" version "1.8.22" + id "org.jetbrains.kotlin.kapt" version "1.8.22" + id "com.exactpro.th2.gradle.component" version "0.1.4" } group 'com.exactpro.th2' version release_version -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +kotlin { + jvmToolchain(11) +} repositories { - mavenLocal() mavenCentral() maven { name 'Sonatype_snapshots' @@ -23,47 +22,35 @@ repositories { name 'Sonatype_releases' url 'https://s01.oss.sonatype.org/content/repositories/releases/' } + mavenLocal() - configurations.all { + configurations.configureEach { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' } } -jar { - manifest { - attributes( - 'Created-By': "${System.getProperty('java.version')} (${System.getProperty('java.vendor')})", - 'Specification-Title': '', - 'Specification-Vendor': 'Exactpro Systems LLC', - 'Implementation-Title': project.archivesBaseName, - 'Implementation-Vendor': 'Exactpro Systems LLC', - 'Implementation-Vendor-Id': 'com.exactpro', - 'Implementation-Version': project.version - ) - } -} - dependencies { - api platform('com.exactpro.th2:bom:4.0.2') - compileOnly 'com.google.auto.service:auto-service:1.0.1' kapt 'com.google.auto.service:auto-service:1.0.1' - implementation 'com.github.ben-manes.caffeine:caffeine:3.1.2' + implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8' + implementation 'io.github.microutils:kotlin-logging:3.0.5' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.18.1' + + implementation 'com.exactpro.th2:common:5.14.0-dev' + implementation "com.exactpro.th2:common-utils:2.3.0-dev" + implementation "com.exactpro.th2:processor-core:0.3.0-dev" - implementation 'com.exactpro.th2:common:4.0.0-TH2-4262-reduce-load-book-and-page-3574992387-SNAPSHOT' - implementation "com.exactpro.th2:common-utils:0.0.1-book-and-page-3572891451-SNAPSHOT" - implementation "com.exactpro.th2:processor-core:0.0.1-TH2-4262-reduce-load-book-and-page-3739179455-7524a15-SNAPSHOT" + implementation "com.exactpro.th2:cradle-cassandra:5.4.4-dev" - implementation "com.exactpro.th2:cradle-cassandra:4.0.0-dev-version-4-2548754188-SNAPSHOT" testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" - testImplementation 'org.mockito.kotlin:mockito-kotlin:4.1.0' + testImplementation 'org.mockito.kotlin:mockito-kotlin:5.4.0' - testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.0" - testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.0" - testRuntimeOnly("org.junit.jupiter:junit-jupiter:5.9.0") + testImplementation "org.junit.jupiter:junit-jupiter-params:5.11.3" + testImplementation "org.junit.jupiter:junit-jupiter:5.11.3" } @@ -73,18 +60,4 @@ test { application { mainClass.set('com.exactpro.th2.processor.MainKt') -} - -applicationName = 'service' - -distTar { - archiveName "${applicationName}.tar" -} - -dockerPrepare { - dependsOn distTar -} - -docker { - copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) -} +} \ No newline at end of file diff --git a/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt index b47bb2f..b5ed525 100644 --- a/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt +++ b/src/test/kotlin/com/exactpro/th2/processor/healer/ProcessorTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2022 Exactpro (Exactpro Systems Limited) + * Copyright 2022-2024 Exactpro (Exactpro Systems Limited) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -245,8 +245,8 @@ class ProcessorTest { verify(cradleStorage, times(3).description("Load events")).getTestEvent(any()) verify(cradleStorage, never().description("Update event A")).updateEventStatus(eq(eventA), eq(false)) - verify(cradleStorage, times(1).description("Update event B")).updateEventStatus(eq(eventB), eq(false)) - verify(cradleStorage, times(1).description("Update event C")).updateEventStatus(eq(eventC), eq(false)) + verify(cradleStorage, times(2).description("Update event B")).updateEventStatus(eq(eventB), eq(false)) + verify(cradleStorage, times(2).description("Update event C")).updateEventStatus(eq(eventC), eq(false)) verify(cradleStorage, never().description("Update event D")).updateEventStatus(eq(eventD), eq(false)) verify(cradleStorage, times(2).description("Update events")).updateEventStatus(any(), any()) @@ -396,7 +396,7 @@ class ProcessorTest { success, ByteArray(10), emptySet(), - PageId(bookId, PAGE_NAME), + PageId(bookId, PAGE_TIMESTAMP, PAGE_NAME), null, Instant.now() ) @@ -410,6 +410,7 @@ class ProcessorTest { private const val C_EVENT_ID = "c_event_id" private const val D_EVENT_ID = "d_event_id" + private val PAGE_TIMESTAMP = Instant.now() private val SETTINGS = Settings(1, 1, TimeUnit.MILLISECONDS, 3) private val PROCESSOR_EVENT_ID = EventID.newBuilder().apply { bookName = BOOK_NAME From 772b8a7bd88ca878dcdd6e0d676fa2a5129c08d4 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 13 Nov 2024 17:15:11 +0400 Subject: [PATCH 14/17] [TH2-5254] Updated workflows --- .github/workflows/build-dev-release.yml | 15 +++++++ .github/workflows/build-release.yml | 15 +++++++ .github/workflows/build-sanpshot.yml | 20 ++++++++++ .github/workflows/ci-unwelcome-words.yml | 28 ++++++------- .github/workflows/dev-docker-publish.yml | 51 ------------------------ .github/workflows/docker-publish.yml | 37 ----------------- 6 files changed, 64 insertions(+), 102 deletions(-) create mode 100644 .github/workflows/build-dev-release.yml create mode 100644 .github/workflows/build-release.yml create mode 100644 .github/workflows/build-sanpshot.yml delete mode 100644 .github/workflows/dev-docker-publish.yml delete mode 100644 .github/workflows/docker-publish.yml diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml new file mode 100644 index 0000000..b438d11 --- /dev/null +++ b/.github/workflows/build-dev-release.yml @@ -0,0 +1,15 @@ +name: Build and publish dev release Docker image to Github Container Registry ghcr.io + +on: workflow_dispatch + +jobs: + build: + uses: th2-net/.github/.github/workflows/compound-java.yml@main + with: + build-target: 'Docker' + devRelease: true + createTag: true + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 0000000..dcf70be --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,15 @@ +name: Build and publish release Docker image to Github Container Registry ghcr.io + +on: workflow_dispatch + +jobs: + build: + uses: th2-net/.github/.github/workflows/compound-java.yml@main + with: + build-target: 'Docker' + devRelease: false + createTag: true + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/build-sanpshot.yml b/.github/workflows/build-sanpshot.yml new file mode 100644 index 0000000..9366a44 --- /dev/null +++ b/.github/workflows/build-sanpshot.yml @@ -0,0 +1,20 @@ +name: Build and publish Docker image to Github Container Registry ghcr.io + +on: + push: + branches-ignore: + - master + - version-* + - dependabot** + paths-ignore: + - README.md + +jobs: + build-job: + uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main + with: + build-target: 'Docker' + docker-username: ${{ github.actor }} + secrets: + docker-password: ${{ secrets.GITHUB_TOKEN }} + nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml index 06dbda0..4e5f3a6 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.github/workflows/ci-unwelcome-words.yml @@ -7,17 +7,17 @@ jobs: test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.sha }} - - name: Checkout tool - uses: actions/checkout@v2 - with: - repository: exactpro-th2/ci-github-action - ref: master - token: ${{ secrets.PAT_CI_ACTION }} - path: ci-github-action - - name: Run CI action - uses: ./ci-github-action - with: - ref: ${{ github.sha }} \ No newline at end of file + - uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + - name: Checkout tool + uses: actions/checkout@v4 + with: + repository: exactpro-th2/ci-github-action + ref: master + token: ${{ secrets.PAT_CI_ACTION }} + path: ci-github-action + - name: Run CI action + uses: ./ci-github-action + with: + ref: ${{ github.sha }} diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/dev-docker-publish.yml deleted file mode 100644 index 7ad5102..0000000 --- a/.github/workflows/dev-docker-publish.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Dev build and publish Docker distributions to Github Container Registry ghcr.io - -on: - push: - branches-ignore: - - master - - version-* -# paths: -# - gradle.properties -# - package_info.json - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - # Prepare custom build version - - name: Get branch name - id: branch - run: echo "branch_name=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - - name: Get SHA of the commit - id: sha - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - name: Get release_version - id: ver - uses: christian-draeger/read-properties@1.1.1 - with: - path: gradle.properties - properties: release_version - - name: Build custom release version - id: release_ver - run: echo value="${{ steps.ver.outputs.release_version }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}-${{ steps.sha.outputs.sha_short }}" >> $GITHUB_OUTPUT - - name: Show custom release version - run: echo ${{ steps.release_ver.outputs.value }} - # Build and publish image - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT - id: meta - - name: Build and push - id: docker_build - uses: docker/build-push-action@v3 - with: - push: true - tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }} - labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }} \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml deleted file mode 100644 index e529cdb..0000000 --- a/.github/workflows/docker-publish.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Build and publish Docker distributions to Github Container Registry ghcr.io - -on: - push: - branches: - - master - - version-* - paths: - - gradle.properties - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT - id: meta - - name: Read version from gradle.properties - id: read_property - uses: christian-draeger/read-properties@1.1.1 - with: - path: ./gradle.properties - properties: release_version - - name: Build and push - id: docker_build - uses: docker/build-push-action@v3 - with: - push: true - tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.release_version }} - labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.release_version }} \ No newline at end of file From 8a9a9666c484e77f11d1df5dbd1104a46b2d5631 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 13 Nov 2024 17:23:24 +0400 Subject: [PATCH 15/17] [TH2-5254] Updated auto-service:1.1.1 --- README.md | 18 ++++++++++++++++-- build.gradle | 4 ++-- gradle.properties | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cbb9802..78e63c7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Healer data processor (0.0.2) +# Healer data processor (0.0.3) Healer data processor fixes wrong status of events. When a child event has a "failed" status and its parent has a "success" status, the status of the parent is wrong. Healer finds the parent event and makes its status "failed", too. @@ -81,4 +81,18 @@ parameters. + th2-common - https://github.com/th2-net/th2-common-j -+ th2-crawler - https://github.com/th2-net/th2-crawler \ No newline at end of file ++ th2-crawler - https://github.com/th2-net/th2-crawler + +## Release notes + +### 0.0.3 +* Migrated to th2 gradle plugin `0.1.4` (based on th2-bom: `4.8.0`) +* Updated: + * common: `5.14.0-dev` + * common-utils: `2.3.0-dev` + * processor-core: `0.3.0-dev` + * cradle-cassandra: `5.4.4-dev` + * auto-service: `1.1.1` + * caffeine: `3.1.8` + * kotlin-logging: `3.0.5` + * kotlin: `1.8.22` \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7dbe4be..03e3241 100644 --- a/build.gradle +++ b/build.gradle @@ -31,8 +31,8 @@ repositories { } dependencies { - compileOnly 'com.google.auto.service:auto-service:1.0.1' - kapt 'com.google.auto.service:auto-service:1.0.1' + compileOnly 'com.google.auto.service:auto-service:1.1.1' + kapt 'com.google.auto.service:auto-service:1.1.1' implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8' implementation 'io.github.microutils:kotlin-logging:3.0.5' diff --git a/gradle.properties b/gradle.properties index a3c264a..044fc6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -release_version = 0.0.2 +release_version = 0.0.3 description = 'th2 data service for fixing wrong status of events' vcs_url=https://github.com/th2-net/th2-crawler-event-healer.git From 64a305cad764423fa67071d66ae93683cd5653b2 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Thu, 14 Nov 2024 17:37:49 +0400 Subject: [PATCH 16/17] [TH2-5254] Updated readme --- README.md | 160 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 78e63c7..1b582f9 100644 --- a/README.md +++ b/README.md @@ -1,87 +1,143 @@ -# Healer data processor (0.0.3) +# Event healer processor (0.0.3) -Healer data processor fixes wrong status of events. When a child event has a "failed" status and its parent +Event healer processor fixes wrong status of events. When a child event has a "failed" status and its parent has a "success" status, the status of the parent is wrong. Healer finds the parent event and makes its status "failed", too. +Sometimes parent event doesn't exist in cradle when the healer process its child event with "failed" states. +In this case processor repeats searching of the parent event with interval according to `processorSettings` + ## Configuration -There is an example of full configuration (infra-2.0) for the data processor +There is an example of full configuration (infra-2.1) for the event healer processor ```yaml -apiVersion: th2.exactpro.com/v1 +apiVersion: th2.exactpro.com/v2 kind: Th2Box metadata: name: event-healer spec: - image-name: ghcr.io/th2-net/th2-crawler-event-healer - image-version: + imageName: ghcr.io/th2-net/th2-crawler-event-healer + imageVersion: 0.0.3-dev type: th2-conn - custom-config: - stateSessionAlias: my-processor-state - enableStoreState: false - from: 2021-06-16T12:00:00.00Z - to: 2021-06-17T14:00:00.00Z - intervalLength: PT10M - syncInterval: PT10M - awaitTimeout: 10 - awaitUnit: SECONDS - events: - bookToScope: - book1: [] - book2: [] - processorSettings: - name: test-event-healer - version: 1.0.0 - maxCacheCapacity: 1000 pins: grpc: client: - name: to_data_provider - service-class: com.exactpro.th2.dataprovider.lw.grpc.DataProviderService + serviceClass: com.exactpro.th2.dataprovider.lw.grpc.DataProviderService linkTo: - - box: lw-data-provider + - box: lw-data-provider-grpc pin: server - name: to_data_provider_stream - service-class: com.exactpro.th2.dataprovider.lw.grpc.QueueDataProviderService + serviceClass: com.exactpro.th2.dataprovider.lw.grpc.QueueDataProviderService linkTo: - - box: lw-data-provider + - box: lw-data-provider-grpc pin: server - extended-settings: + customConfig: + crawler: + from: 2024-11-14T00:00:00.00Z + intervalLength: PT10M + syncInterval: PT10M + awaitTimeout: 10 + awaitUnit: SECONDS + events: + bookToScopes: + test_book: [ "script" ] + processorSettings: + maxCacheCapacity: 1024 + updateUnsubmittedEventInterval: 1 + updateUnsubmittedEventTimeUnit: SECONDS + updateUnsubmittedEventAttempts: 100 + extendedSettings: + envVariables: + JAVA_TOOL_OPTIONS: > + -XX:+ExitOnOutOfMemoryError + -XX:+UseContainerSupport + -Dlog4j2.shutdownHookEnabled=false + -Xlog:gc,gc+heap*,gc+start,gc+metaspace::utc,level,tags + -XX:MaxRAMPercentage=38 + -XX:MaxMetaspaceSize=80M + -XX:CompressedClassSpaceSize=12M + -XX:ReservedCodeCacheSize=35M + -XX:MaxDirectMemorySize=15M + -Ddatastax-java-driver.advanced.connection.init-query-timeout="5000 milliseconds" + -Ddatastax-java-driver.basic.request.timeout="10 seconds" + resources: + limits: + memory: 250Mi + cpu: 200m + requests: + memory: 100Mi + cpu: 50m +``` + +Please note the `th2-lw-data-provider` worked in gRPC mode is required for the current processor. +The main configuration of `th2-lw-data-provider` described below, full documentation can be found by the (link)[https://github.com/th2-net/th2-lw-data-provider] + +```yaml +apiVersion: th2.exactpro.com/v2 +kind: Th2CoreBox +metadata: + name: lw-data-provider-grpc +spec: + imageName: ghcr.io/th2-net/th2-lw-data-provider + imageVersion: 2.12.0-dev + type: th2-rpt-data-provider + customConfig: + grpcBackPressure: true + hostname: 0.0.0.0 + port: 8080 + mode: GRPC + extendedSettings: + envVariables: + JAVA_TOOL_OPTIONS: > + -XX:+ExitOnOutOfMemoryError + -XX:+UseContainerSupport + -Dlog4j2.shutdownHookEnabled=false + -Xlog:gc,gc+heap*,gc+start,gc+metaspace::utc,level,tags + -XX:MaxRAMPercentage=85 + -Ddatastax-java-driver.advanced.connection.init-query-timeout="5000 milliseconds" + -Ddatastax-java-driver.basic.request.timeout="10 seconds" + resources: + limits: + memory: 1000Mi + ephemeral-storage: 500Mi + cpu: 1000m + requests: + memory: 300Mi + ephemeral-storage: 500Mi + cpu: 50m service: enabled: true - type: ClusterIP - endpoints: - - name: 'grpc' - targetPort: 8080 - envVariables: - JAVA_TOOL_OPTIONS: '-XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:MaxRAMPercentage=85' - resources: - limits: - memory: 200Mi - cpu: 200m - requests: - memory: 100Mi - cpu: 50m + clusterIP: + - name: grpc + containerPort: 8080 + pins: + grpc: + server: + - name: server + serviceClasses: + - com.exactpro.th2.dataprovider.lw.grpc.DataProviderService + - com.exactpro.th2.dataprovider.lw.grpc.QueueDataProviderService ``` -### Parameters description +### Processor settings description -+ name - the data processor name -+ version - the data processor version -+ maxCacheCapacity - the maximum capacity of the cache that stores - events processed by Healer. Caching events is useful in order to ++ **maxCacheCapacity** (_**1024** by default_) - the maximum capacity of the cache that stores + events processed by Healer. Caching events is useful in order to avoid their repeated retrieval from Cradle. - After reaching the maximum capacity, the least recent accessed event + After reaching the maximum capacity, the least recent accessed event from the cache will be removed, so no overflow occurs. - -See th2-crawler in **Useful links** section to see the goal of *name* and *version* -parameters. ++ **updateUnsubmittedEventInterval** (_**1** by default_) - value of interval between attempts for updating parent event status if it doesn't exist ++ **updateUnsubmittedEventTimeUnit** (_**SECONDS** by default_) - time unit of interval between attempts for updating parent event status if it doesn't exist ++ **updateUnsubmittedEventAttempts** (_**100**_ by default_) - number of attempts to update parent event status if it doesn't exist # Useful links -+ th2-common - https://github.com/th2-net/th2-common-j +The event-healer based on the th2-processor-core project, you can look at its readme to read about processor configuration. -+ th2-crawler - https://github.com/th2-net/th2-crawler ++ th2-processor-core - https://github.com/th2-net/th2-processor-core-j ++ th2-lw-data-provider - https://github.com/th2-net/th2-lw-data-provider ++ th2-common - https://github.com/th2-net/th2-common-j ## Release notes From ba468e96cde834c293133fe7cb7b0697854c0a14 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Thu, 14 Nov 2024 17:52:08 +0400 Subject: [PATCH 17/17] [TH2-5254] Updated readme --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 1b582f9..5fa1f20 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,24 @@ spec: - name: grpc containerPort: 8080 pins: + mq: + subscribers: + - name: from_codec_transport + attributes: + - from_codec + - transport-group + - subscribe + - name: from_codec_proto + attributes: + - from_codec + - parsed + - subscribe + publishers: + - name: to_codec + attributes: + - to_codec + - transport-group + - publish grpc: server: - name: server