From de1e49d98fcd5e24c2bfcf74451a3959ef9155fa Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:24:57 +0900 Subject: [PATCH 01/36] first commit --- .gitignore | 43 ++++ broker/broker-mongodb/build.gradle.kts | 33 +++ .../usbharu/owl/broker/mongodb/MongoModule.kt | 26 ++ .../owl/broker/mongodb/MongoModuleContext.kt | 26 ++ .../mongodb/MongodbConsumerRepository.kt | 69 ++++++ .../mongodb/MongodbProducerRepository.kt | 71 ++++++ .../mongodb/MongodbQueuedTaskRepository.kt | 113 +++++++++ .../MongodbTaskDefinitionRepository.kt | 85 +++++++ .../broker/mongodb/MongodbTaskRepository.kt | 89 +++++++ .../mongodb/MongodbConsumerRepositoryTest.kt | 48 ++++ broker/build.gradle.kts | 67 +++++ .../kotlin/dev/usbharu/owl/broker/Main.kt | 68 +++++ .../dev/usbharu/owl/broker/ModuleContext.kt | 23 ++ .../owl/broker/OwlBrokerApplication.kt | 66 +++++ .../broker/domain/model/consumer/Consumer.kt | 26 ++ .../model/consumer/ConsumerRepository.kt | 25 ++ .../broker/domain/model/producer/Producer.kt | 28 +++ .../model/producer/ProducerRepository.kt | 21 ++ .../domain/model/queuedtask/QueuedTask.kt | 32 +++ .../model/queuedtask/QueuedTaskRepository.kt | 31 +++ .../owl/broker/domain/model/task/Task.kt | 35 +++ .../domain/model/task/TaskRepository.kt | 26 ++ .../model/taskdefinition/TaskDefinition.kt | 26 ++ .../TaskDefinitionRepository.kt | 24 ++ .../owl/broker/external/GrpcExtension.kt | 35 +++ .../interfaces/grpc/AssignmentTaskService.kt | 58 +++++ .../interfaces/grpc/DefinitionTaskService.kt | 55 ++++ .../broker/interfaces/grpc/ProducerService.kt | 42 ++++ .../interfaces/grpc/SubscribeTaskService.kt | 39 +++ .../interfaces/grpc/TaskPublishService.kt | 69 ++++++ .../broker/service/AssignQueuedTaskDecider.kt | 48 ++++ .../owl/broker/service/ConsumerService.kt | 63 +++++ .../owl/broker/service/ProducerService.kt | 58 +++++ .../usbharu/owl/broker/service/QueueStore.kt | 58 +++++ .../owl/broker/service/QueuedTaskAssigner.kt | 76 ++++++ .../owl/broker/service/RegisterTaskService.kt | 48 ++++ .../usbharu/owl/broker/service/RetryPolicy.kt | 31 +++ .../owl/broker/service/RetryPolicyFactory.kt | 27 ++ .../broker/service/TaskManagementService.kt | 89 +++++++ .../owl/broker/service/TaskPublishService.kt | 81 ++++++ .../usbharu/owl/broker/service/TaskScanner.kt | 54 ++++ broker/src/main/proto/consumer.proto | 18 ++ broker/src/main/proto/definition_task.proto | 31 +++ broker/src/main/proto/producer.proto | 18 ++ broker/src/main/proto/property.proto | 13 + broker/src/main/proto/publish_task.proto | 25 ++ broker/src/main/proto/task.proto | 23 ++ broker/src/main/proto/task_result.proto | 13 + broker/src/main/proto/uuid.proto | 8 + broker/src/main/resources/log4j2.xml | 40 +++ .../service/TaskManagementServiceImplTest.kt | 13 + build.gradle.kts | 37 +++ common/build.gradle.kts | 21 ++ .../common/property/IntegerPropertyValue.kt | 22 ++ .../common/property/PropertySerializeUtils.kt | 31 +++ .../owl/common/property/PropertySerializer.kt | 25 ++ .../property/PropertySerializerFactory.kt | 22 ++ .../property/PropertySerializerFactoryImpl.kt | 28 +++ .../owl/common/property/PropertyType.kt | 22 ++ .../owl/common/property/PropertyValue.kt | 22 ++ .../usbharu/owl/common/retry/RetryPolicy.kt | 20 ++ .../owl/common/task/PropertyDefinition.kt | 23 ++ .../usbharu/owl/common/task/PublishedTask.kt | 26 ++ .../dev/usbharu/owl/common/task/Task.kt | 20 ++ .../usbharu/owl/common/task/TaskDefinition.kt | 32 +++ gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 234 ++++++++++++++++++ gradlew.bat | 89 +++++++ producer/api/build.gradle.kts | 21 ++ .../usbharu/owl/producer/api/OwlProducer.kt | 27 ++ .../owl/producer/api/OwlProducerFactory.kt | 23 ++ producer/impl/build.gradle.kts | 21 ++ .../producer/impl/DefaultOwlProducer.kt | 32 +++ .../producer/impl/OwlTaskDatasource.kt | 27 ++ .../impl/datasource/DatasourceFactory.kt | 23 ++ .../ServiceProviderDatasourceFactory.kt | 32 +++ settings.gradle.kts | 12 + 79 files changed, 3133 insertions(+) create mode 100644 .gitignore create mode 100644 broker/broker-mongodb/build.gradle.kts create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt create mode 100644 broker/broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt create mode 100644 broker/build.gradle.kts create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt create mode 100644 broker/src/main/proto/consumer.proto create mode 100644 broker/src/main/proto/definition_task.proto create mode 100644 broker/src/main/proto/producer.proto create mode 100644 broker/src/main/proto/property.proto create mode 100644 broker/src/main/proto/publish_task.proto create mode 100644 broker/src/main/proto/task.proto create mode 100644 broker/src/main/proto/task_result.proto create mode 100644 broker/src/main/proto/uuid.proto create mode 100644 broker/src/main/resources/log4j2.xml create mode 100644 broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt create mode 100644 build.gradle.kts create mode 100644 common/build.gradle.kts create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactoryImpl.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 producer/api/build.gradle.kts create mode 100644 producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt create mode 100644 producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerFactory.kt create mode 100644 producer/impl/build.gradle.kts create mode 100644 producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt create mode 100644 producer/impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt create mode 100644 producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt create mode 100644 producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..bf3e1b20 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store +/.idea/ diff --git a/broker/broker-mongodb/build.gradle.kts b/broker/broker-mongodb/build.gradle.kts new file mode 100644 index 00000000..8268414e --- /dev/null +++ b/broker/broker-mongodb/build.gradle.kts @@ -0,0 +1,33 @@ +plugins { + kotlin("jvm") + id("com.google.devtools.ksp") version "1.9.22-1.0.17" +} + +apply { + plugin("com.google.devtools.ksp") +} + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0") + compileOnly(project(":broker")) + implementation(project(":common")) + implementation(platform("io.insert-koin:koin-bom:3.5.3")) + implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) + implementation("io.insert-koin:koin-core") + compileOnly("io.insert-koin:koin-annotations") + ksp("io.insert-koin:koin-ksp-compiler:1.3.1") +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} \ No newline at end of file diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt new file mode 100644 index 00000000..33f40868 --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import org.koin.core.annotation.ComponentScan +import org.koin.core.annotation.Module + +@Module +@ComponentScan("dev.usbharu.owl.broker.mongodb") +class MongoModule { +} + diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt new file mode 100644 index 00000000..0fa424d3 --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import dev.usbharu.owl.broker.ModuleContext +import org.koin.ksp.generated.module + +class MongoModuleContext : ModuleContext { + override fun module(): org.koin.core.module.Module { + return MongoModule().module + } +} \ No newline at end of file diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt new file mode 100644 index 00000000..1c348921 --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import com.mongodb.client.model.Filters +import com.mongodb.client.model.ReplaceOptions +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import dev.usbharu.owl.broker.domain.model.consumer.Consumer +import dev.usbharu.owl.broker.domain.model.consumer.ConsumerRepository +import kotlinx.coroutines.flow.singleOrNull +import org.bson.BsonType +import org.bson.codecs.pojo.annotations.BsonId +import org.bson.codecs.pojo.annotations.BsonRepresentation +import org.koin.core.annotation.Singleton +import java.util.* + +@Singleton +class MongodbConsumerRepository(database: MongoDatabase) : ConsumerRepository { + + private val collection = database.getCollection("consumers") + override suspend fun save(consumer: Consumer): Consumer { + collection.replaceOne(Filters.eq("_id", consumer.id.toString()), ConsumerMongodb.of(consumer), ReplaceOptions().upsert(true)) + return consumer + } + + override suspend fun findById(id: UUID): Consumer? { + return collection.find(Filters.eq("_id", id.toString())).singleOrNull()?.toConsumer() + } +} + +data class ConsumerMongodb( + @BsonId + @BsonRepresentation(BsonType.STRING) + val id: String, + val name: String, + val hostname: String, + val tasks: List +){ + + fun toConsumer():Consumer{ + return Consumer( + UUID.fromString(id), name, hostname, tasks + ) + } + companion object{ + fun of(consumer: Consumer):ConsumerMongodb{ + return ConsumerMongodb( + consumer.id.toString(), + consumer.name, + consumer.hostname, + consumer.tasks + ) + } + } +} \ No newline at end of file diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt new file mode 100644 index 00000000..fe93cf88 --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import com.mongodb.client.model.Filters +import com.mongodb.client.model.ReplaceOptions +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import dev.usbharu.owl.broker.domain.model.producer.Producer +import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository +import org.koin.core.annotation.Singleton +import java.time.Instant +import java.util.* + +@Singleton +class MongodbProducerRepository(database: MongoDatabase) : ProducerRepository { + + private val collection = database.getCollection("producers") + + override suspend fun save(producer: Producer): Producer { + collection.replaceOne( + Filters.eq("_id", producer.id.toString()), + ProducerMongodb.of(producer), + ReplaceOptions().upsert(true) + ) + return producer + } +} + +data class ProducerMongodb( + val id: String, + val name: String, + val hostname: String, + val registeredTask: List, + val createdAt: Instant +) { + fun toProducer(): Producer { + return Producer( + id = UUID.fromString(id), + name = name, + hostname = hostname, + registeredTask = registeredTask, + createdAt = createdAt + ) + } + + companion object { + fun of(producer: Producer): ProducerMongodb { + return ProducerMongodb( + id = producer.id.toString(), + name = producer.name, + hostname = producer.hostname, + registeredTask = producer.registeredTask, + createdAt = producer.createdAt + ) + } + } +} \ No newline at end of file diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt new file mode 100644 index 00000000..c44cf96c --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import com.mongodb.client.model.Filters.* +import com.mongodb.client.model.FindOneAndUpdateOptions +import com.mongodb.client.model.ReplaceOptions +import com.mongodb.client.model.ReturnDocument +import com.mongodb.client.model.Updates.set +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTaskRepository +import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import org.bson.BsonType +import org.bson.codecs.pojo.annotations.BsonId +import org.bson.codecs.pojo.annotations.BsonRepresentation +import org.koin.core.annotation.Singleton +import java.time.Instant +import java.util.* + +@Singleton +class MongodbQueuedTaskRepository(private val propertySerializerFactory: PropertySerializerFactory,database: MongoDatabase) : QueuedTaskRepository { + + private val collection = database.getCollection("queued_task") + override suspend fun save(queuedTask: QueuedTask): QueuedTask { + collection.replaceOne( + eq("_id", queuedTask.task.id.toString()), QueuedTaskMongodb.of(propertySerializerFactory,queuedTask), + ReplaceOptions().upsert(true) + ) + return queuedTask + } + + override suspend fun findByTaskIdAndAssignedConsumerIsNullAndUpdate(id: UUID, update: QueuedTask): QueuedTask { + val findOneAndUpdate = collection.findOneAndUpdate( + and( + eq("_id", id.toString()), + eq(QueuedTaskMongodb::assignedConsumer.name, null) + ), + listOf( + set(QueuedTaskMongodb::assignedConsumer.name, update.assignedConsumer), + set(QueuedTaskMongodb::assignedAt.name, update.assignedAt) + ), + FindOneAndUpdateOptions().upsert(false).returnDocument(ReturnDocument.AFTER) + ) + if (findOneAndUpdate == null) { + TODO() + } + return findOneAndUpdate.toQueuedTask(propertySerializerFactory) + } + + override fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( + tasks: List, + limit: Int + ): Flow { + return collection.find( + and( + `in`("task.name", tasks), + eq(QueuedTaskMongodb::assignedConsumer.name, null) + ) + ).map { it.toQueuedTask(propertySerializerFactory) } + } +} + +data class QueuedTaskMongodb( + @BsonId + @BsonRepresentation(BsonType.STRING) + val id: String, + val task: TaskMongodb, + val attempt: Int, + val queuedAt: Instant, + val assignedConsumer: String?, + val assignedAt: Instant? +) { + + fun toQueuedTask(propertySerializerFactory: PropertySerializerFactory): QueuedTask { + return QueuedTask( + attempt, + queuedAt, + task.toTask(propertySerializerFactory), + UUID.fromString(assignedConsumer), + assignedAt + ) + } + + companion object { + fun of(propertySerializerFactory: PropertySerializerFactory,queuedTask: QueuedTask): QueuedTaskMongodb { + return QueuedTaskMongodb( + queuedTask.task.id.toString(), + TaskMongodb.of(propertySerializerFactory,queuedTask.task), + queuedTask.attempt, + queuedTask.queuedAt, + queuedTask.assignedConsumer?.toString(), + queuedTask.assignedAt + ) + } + } +} \ No newline at end of file diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt new file mode 100644 index 00000000..a186cd52 --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import com.mongodb.client.model.Filters +import com.mongodb.client.model.ReplaceOptions +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository +import kotlinx.coroutines.flow.singleOrNull +import org.bson.BsonType +import org.bson.codecs.pojo.annotations.BsonId +import org.bson.codecs.pojo.annotations.BsonRepresentation +import org.koin.core.annotation.Singleton + +@Singleton +class MongodbTaskDefinitionRepository(database: MongoDatabase) : TaskDefinitionRepository { + + private val collection = database.getCollection("task_definition") + override suspend fun save(taskDefinition: TaskDefinition): TaskDefinition { + collection.replaceOne( + Filters.eq("_id", taskDefinition.name), + TaskDefinitionMongodb.of(taskDefinition), + ReplaceOptions().upsert(true) + ) + return taskDefinition + } + + override suspend fun deleteByName(name: String) { + collection.deleteOne(Filters.eq("_id",name)) + } + + override suspend fun findByName(name: String): TaskDefinition? { + return collection.find(Filters.eq("_id", name)).singleOrNull()?.toTaskDefinition() + } +} + +data class TaskDefinitionMongodb( + @BsonId + @BsonRepresentation(BsonType.STRING) + val name: String, + val priority: Int, + val maxRetry: Int, + val timeoutMilli: Long, + val propertyDefinitionHash: Long, + val retryPolicy: String +) { + fun toTaskDefinition(): TaskDefinition { + return TaskDefinition( + name = name, + priority = priority, + maxRetry = maxRetry, + timeoutMilli = timeoutMilli, + propertyDefinitionHash = propertyDefinitionHash, + retryPolicy = retryPolicy + ) + } + + companion object { + fun of(taskDefinition: TaskDefinition): TaskDefinitionMongodb { + return TaskDefinitionMongodb( + name = taskDefinition.name, + priority = taskDefinition.priority, + maxRetry = taskDefinition.maxRetry, + timeoutMilli = taskDefinition.timeoutMilli, + propertyDefinitionHash = taskDefinition.propertyDefinitionHash, + retryPolicy = taskDefinition.retryPolicy + ) + } + } +} \ No newline at end of file diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt new file mode 100644 index 00000000..9dd5b4e5 --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import com.mongodb.client.model.Filters +import com.mongodb.client.model.ReplaceOptions +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import dev.usbharu.owl.broker.domain.model.task.Task +import dev.usbharu.owl.broker.domain.model.task.TaskRepository +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import org.koin.core.annotation.Singleton +import java.time.Instant +import java.util.* + +@Singleton +class MongodbTaskRepository(database: MongoDatabase, private val propertySerializerFactory: PropertySerializerFactory) : + TaskRepository { + + private val collection = database.getCollection("tasks") + override suspend fun save(task: Task): Task { + collection.replaceOne( + Filters.eq("_id", task.id.toString()), TaskMongodb.of(propertySerializerFactory, task), + ReplaceOptions().upsert(true) + ) + return task + } + + override fun findByNextRetryBefore(timestamp: Instant): Flow { + return collection.find(Filters.lte(TaskMongodb::nextRetry.name, timestamp)) + .map { it.toTask(propertySerializerFactory) } + } +} + +data class TaskMongodb( + val name: String, + val id: String, + val publishProducerId: String, + val publishedAt: Instant, + val nextRetry: Instant, + val completedAt: Instant?, + val attempt: Int, + val properties: Map +) { + + fun toTask(propertySerializerFactory: PropertySerializerFactory): Task { + return Task( + name = name, + id = UUID.fromString(id), + publishProducerId = UUID.fromString(publishProducerId), + publishedAt = publishedAt, + nextRetry = nextRetry, + completedAt = completedAt, + attempt = attempt, + properties = PropertySerializeUtils.deserialize(propertySerializerFactory, properties) + ) + } + + companion object { + fun of(propertySerializerFactory: PropertySerializerFactory, task: Task): TaskMongodb { + return TaskMongodb( + task.name, + task.id.toString(), + task.publishProducerId.toString(), + task.publishedAt, + task.nextRetry, + task.completedAt, + task.attempt, + PropertySerializeUtils.serialize(propertySerializerFactory, task.properties) + ) + } + } +} \ No newline at end of file diff --git a/broker/broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt b/broker/broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt new file mode 100644 index 00000000..b71c5ea4 --- /dev/null +++ b/broker/broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt @@ -0,0 +1,48 @@ +package dev.usbharu.owl.broker.mongodb + +import com.mongodb.ConnectionString +import com.mongodb.MongoClientSettings +import com.mongodb.kotlin.client.coroutine.MongoClient +import dev.usbharu.owl.broker.domain.model.consumer.Consumer +import kotlinx.coroutines.runBlocking +import org.bson.UuidRepresentation +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import java.util.* + + +class MongodbConsumerRepositoryTest { + @Test + fun name() { + + val clientSettings = + MongoClientSettings.builder().applyConnectionString(ConnectionString("mongodb://localhost:27017")) + .uuidRepresentation(UuidRepresentation.STANDARD).build() + + + val database = MongoClient.create(clientSettings).getDatabase("mongo-test") + + val mongodbConsumerRepository = MongodbConsumerRepository(database) + + val consumer = Consumer( + UUID.randomUUID(), + name = "test", + hostname = "aaa", + tasks = listOf("a", "b", "c") + ) + runBlocking { + mongodbConsumerRepository.save(consumer) + + val findById = mongodbConsumerRepository.findById(UUID.randomUUID()) + assertEquals(null, findById) + + val findById1 = mongodbConsumerRepository.findById(consumer.id) + assertEquals(consumer, findById1) + + mongodbConsumerRepository.save(consumer.copy(name = "test2")) + + val findById2 = mongodbConsumerRepository.findById(consumer.id) + assertEquals(consumer.copy(name = "test2"), findById2) + } + } +} \ No newline at end of file diff --git a/broker/build.gradle.kts b/broker/build.gradle.kts new file mode 100644 index 00000000..c16d61b7 --- /dev/null +++ b/broker/build.gradle.kts @@ -0,0 +1,67 @@ +plugins { + kotlin("jvm") + id("com.google.protobuf") version "0.9.4" + id("com.google.devtools.ksp") version "1.9.22-1.0.17" +} + +apply { + plugin("com.google.devtools.ksp") +} + + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + implementation("io.grpc:grpc-kotlin-stub:1.4.1") + implementation("io.grpc:grpc-protobuf:1.61.1") + implementation("com.google.protobuf:protobuf-kotlin:3.25.3") + implementation("io.grpc:grpc-netty:1.61.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") + implementation("org.mongodb:mongodb-driver-kotlin-coroutine:4.11.0") + implementation("org.mongodb:bson-kotlinx:4.11.0") + implementation(project(":common")) + runtimeOnly(project(":broker:broker-mongodb")) + implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") + implementation(platform("io.insert-koin:koin-bom:3.5.3")) + implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) + implementation("io.insert-koin:koin-core") + compileOnly("io.insert-koin:koin-annotations") + ksp("io.insert-koin:koin-ksp-compiler:1.3.1") +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} + +protobuf { + protoc { + artifact = "com.google.protobuf:protoc:3.25.3" + } + plugins { + create("grpc") { + artifact = "io.grpc:protoc-gen-grpc-java:1.61.1" + } + create("grpckt") { + artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" + } + } + generateProtoTasks { + all().forEach { + it.plugins { + create("grpc") + create("grpckt") + } + it.builtins { + create("kotlin") + } + } + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt new file mode 100644 index 00000000..4241cafb --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker + +import com.mongodb.ConnectionString +import com.mongodb.MongoClientSettings +import com.mongodb.kotlin.client.coroutine.MongoClient +import dev.usbharu.owl.broker.service.DefaultRetryPolicyFactory +import dev.usbharu.owl.broker.service.RetryPolicyFactory +import dev.usbharu.owl.common.property.PropertySerializerFactory +import dev.usbharu.owl.common.property.PropertySerializerFactoryImpl +import kotlinx.coroutines.runBlocking +import org.bson.UuidRepresentation +import org.koin.core.context.startKoin +import org.koin.dsl.module +import org.koin.ksp.generated.defaultModule + +fun main() { + + val moduleContext = + Class.forName("dev.usbharu.owl.broker.mongodb.MongoModuleContext").newInstance() as ModuleContext + + + +// println(File(Thread.currentThread().contextClassLoader.getResource("dev/usbharu/owl/broker/mongodb").file).listFiles().joinToString()) + + val koin = startKoin { + printLogger() + + val module = module { + single { + val clientSettings = + MongoClientSettings.builder().applyConnectionString(ConnectionString("mongodb://localhost:27017")) + .uuidRepresentation(UuidRepresentation.STANDARD).build() + + + MongoClient.create(clientSettings).getDatabase("mongo-test") + } + single { + PropertySerializerFactoryImpl() + } + single { + DefaultRetryPolicyFactory(emptyMap()) + } + } + modules(module,defaultModule, moduleContext.module()) + } + + val application = koin.koin.get() + + runBlocking { + application.start(50051).join() + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt new file mode 100644 index 00000000..1478f4f9 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker + +import org.koin.core.module.Module + +interface ModuleContext { + fun module():Module +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt new file mode 100644 index 00000000..a6cc6176 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker + +import dev.usbharu.owl.broker.interfaces.grpc.* +import dev.usbharu.owl.broker.service.TaskManagementService +import io.grpc.Server +import io.grpc.ServerBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch +import org.koin.core.annotation.Singleton + +@Singleton +class OwlBrokerApplication( + private val assignmentTaskService: AssignmentTaskService, + private val definitionTaskService: DefinitionTaskService, + private val producerService: ProducerService, + private val subscribeTaskService: SubscribeTaskService, + private val taskPublishService: TaskPublishService, + private val taskManagementService: TaskManagementService +) { + + private lateinit var server: Server + + fun start(port: Int,coroutineScope: CoroutineScope = GlobalScope):Job { + server = ServerBuilder.forPort(port) + .addService(assignmentTaskService) + .addService(definitionTaskService) + .addService(producerService) + .addService(subscribeTaskService) + .addService(taskPublishService) + .build() + + server.start() + Runtime.getRuntime().addShutdownHook( + Thread { + server.shutdown() + } + ) + + return coroutineScope.launch { + taskManagementService.startManagement() + } + } + + fun stop() { + server.shutdown() + } + +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt new file mode 100644 index 00000000..27fe78b2 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.consumer + +import java.util.* + +data class Consumer( + val id: UUID, + val name: String, + val hostname: String, + val tasks: List +) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt new file mode 100644 index 00000000..34ebb0af --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.consumer + +import java.util.* + +interface ConsumerRepository { + suspend fun save(consumer: Consumer):Consumer + + suspend fun findById(id:UUID):Consumer? +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt new file mode 100644 index 00000000..0a5e4916 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.producer + +import java.time.Instant +import java.util.UUID + +data class Producer( + val id:UUID, + val name:String, + val hostname:String, + val registeredTask:List, + val createdAt: Instant +) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt new file mode 100644 index 00000000..932cef10 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.producer + +interface ProducerRepository { + suspend fun save(producer: Producer):Producer +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt new file mode 100644 index 00000000..e2ed5f21 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.queuedtask + +import dev.usbharu.owl.broker.domain.model.task.Task +import java.time.Instant +import java.util.* + +/** + * @param attempt キューされた時点での試行回数より1多い + */ +data class QueuedTask( + val attempt: Int, + val queuedAt: Instant, + val task: Task, + val assignedConsumer: UUID?, + val assignedAt:Instant? +) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt new file mode 100644 index 00000000..049b92ac --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.queuedtask + +import kotlinx.coroutines.flow.Flow +import java.util.* + +interface QueuedTaskRepository { + suspend fun save(queuedTask: QueuedTask):QueuedTask + + /** + * トランザクションの代わり + */ + suspend fun findByTaskIdAndAssignedConsumerIsNullAndUpdate(id:UUID,update:QueuedTask):QueuedTask + + fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks:List,limit:Int): Flow +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt new file mode 100644 index 00000000..07347c05 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.task + +import dev.usbharu.owl.common.property.PropertyValue +import java.time.Instant +import java.util.* + +/** + * @param attempt 失敗を含めて試行した回数 + */ +data class Task( + val name:String, + val id: UUID, + val publishProducerId:UUID, + val publishedAt: Instant, + val nextRetry:Instant, + val completedAt: Instant? = null, + val attempt: Int, + val properties: Map +) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt new file mode 100644 index 00000000..60159a24 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.task + +import kotlinx.coroutines.flow.Flow +import java.time.Instant + +interface TaskRepository { + suspend fun save(task: Task):Task + + fun findByNextRetryBefore(timestamp:Instant): Flow +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt new file mode 100644 index 00000000..8fcb8f1e --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.taskdefinition + +data class TaskDefinition( + val name: String, + val priority: Int, + val maxRetry: Int, + val timeoutMilli: Long, + val propertyDefinitionHash: Long, + val retryPolicy:String +) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt new file mode 100644 index 00000000..2a1c3c6a --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.taskdefinition + +interface TaskDefinitionRepository { + suspend fun save(taskDefinition: TaskDefinition): TaskDefinition + suspend fun deleteByName(name:String) + + suspend fun findByName(name:String):TaskDefinition? +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt new file mode 100644 index 00000000..4271b55c --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.external + +import com.google.protobuf.Timestamp +import dev.usbharu.owl.Uuid +import java.time.Instant +import java.util.* + +fun Uuid.UUID.toUUID(): UUID = UUID(mostSignificantUuidBits, leastSignificantUuidBits) + +fun UUID.toUUID(): Uuid.UUID = Uuid + .UUID + .newBuilder() + .setMostSignificantUuidBits(mostSignificantBits) + .setLeastSignificantUuidBits(leastSignificantBits) + .build() + +fun Timestamp.toInstant(): Instant = Instant.ofEpochSecond(seconds, nanos.toLong()) + +fun Instant.toTimestamp():Timestamp = Timestamp.newBuilder().setSeconds(this.epochSecond).setNanos(this.nano).build() \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt new file mode 100644 index 00000000..a1840588 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.interfaces.grpc + +import dev.usbharu.owl.AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineImplBase +import dev.usbharu.owl.Task +import dev.usbharu.owl.Task.TaskRequest +import dev.usbharu.owl.broker.external.toTimestamp +import dev.usbharu.owl.broker.external.toUUID +import dev.usbharu.owl.broker.service.QueuedTaskAssigner +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flatMapMerge +import kotlinx.coroutines.flow.map +import org.koin.core.annotation.Singleton +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +@Singleton +class AssignmentTaskService( + coroutineContext: CoroutineContext = EmptyCoroutineContext, + private val queuedTaskAssigner: QueuedTaskAssigner, + private val propertySerializerFactory: PropertySerializerFactory +) : + AssignmentTaskServiceCoroutineImplBase(coroutineContext) { + + override fun ready(requests: Flow): Flow { + return requests + .flatMapMerge { + queuedTaskAssigner.ready(it.consumerId.toUUID(), it.numberOfConcurrent) + } + .map { + TaskRequest + .newBuilder() + .setName(it.task.name) + .setId(it.task.id.toUUID()) + .setAttempt(it.attempt) + .setQueuedAt(it.queuedAt.toTimestamp()) + .putAllProperties(PropertySerializeUtils.serialize(propertySerializerFactory, it.task.properties)) + .build() + } + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt new file mode 100644 index 00000000..3ce2b5b0 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.interfaces.grpc + +import com.google.protobuf.Empty +import dev.usbharu.owl.DefinitionTask +import dev.usbharu.owl.DefinitionTask.TaskDefined +import dev.usbharu.owl.DefinitionTaskServiceGrpcKt.DefinitionTaskServiceCoroutineImplBase +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition +import dev.usbharu.owl.broker.service.RegisterTaskService +import org.koin.core.annotation.Singleton +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +@Singleton +class DefinitionTaskService(coroutineContext: CoroutineContext = EmptyCoroutineContext,private val registerTaskService: RegisterTaskService) : + DefinitionTaskServiceCoroutineImplBase(coroutineContext) { + override suspend fun register(request: DefinitionTask.TaskDefinition): TaskDefined { + registerTaskService.registerTask( + TaskDefinition( + request.name, + request.priority, + request.maxRetry, + request.timeoutMilli, + request.propertyDefinitionHash, + request.retryPolicy + ) + ) + return TaskDefined + .newBuilder() + .setTaskId( + request.name + ) + .build() + } + + override suspend fun unregister(request: DefinitionTask.TaskUnregister): Empty { + registerTaskService.unregisterTask(request.name) + return Empty.getDefaultInstance() + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt new file mode 100644 index 00000000..c01bec69 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.interfaces.grpc + +import dev.usbharu.owl.ProducerOuterClass +import dev.usbharu.owl.ProducerServiceGrpcKt.ProducerServiceCoroutineImplBase +import dev.usbharu.owl.broker.external.toUUID +import dev.usbharu.owl.broker.service.ProducerService +import dev.usbharu.owl.broker.service.RegisterProducerRequest +import org.koin.core.annotation.Singleton +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +@Singleton +class ProducerService( + coroutineContext: CoroutineContext = EmptyCoroutineContext, + private val producerService: ProducerService +) : + ProducerServiceCoroutineImplBase(coroutineContext) { + override suspend fun registerProducer(request: ProducerOuterClass.Producer): ProducerOuterClass.RegisterProducerResponse { + val registerProducer = producerService.registerProducer( + RegisterProducerRequest( + request.name, request.hostname + ) + ) + return ProducerOuterClass.RegisterProducerResponse.newBuilder().setId(registerProducer.toUUID()).build() + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt new file mode 100644 index 00000000..f521ca0c --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.interfaces.grpc + +import dev.usbharu.owl.Consumer +import dev.usbharu.owl.SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineImplBase +import dev.usbharu.owl.broker.external.toUUID +import dev.usbharu.owl.broker.service.ConsumerService +import dev.usbharu.owl.broker.service.RegisterConsumerRequest +import org.koin.core.annotation.Singleton +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +@Singleton +class SubscribeTaskService( + coroutineContext: CoroutineContext = EmptyCoroutineContext, + private val consumerService: ConsumerService +) : + SubscribeTaskServiceCoroutineImplBase(coroutineContext) { + override suspend fun subscribeTask(request: Consumer.SubscribeTaskRequest): Consumer.SubscribeTaskResponse { + val id = + consumerService.registerConsumer(RegisterConsumerRequest(request.name, request.hostname, request.tasksList)) + return Consumer.SubscribeTaskResponse.newBuilder().setId(id.toUUID()).build() + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt new file mode 100644 index 00000000..803c8934 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.interfaces.grpc + +import dev.usbharu.owl.PublishTaskOuterClass +import dev.usbharu.owl.PublishTaskOuterClass.PublishedTask +import dev.usbharu.owl.TaskPublishServiceGrpcKt.TaskPublishServiceCoroutineImplBase +import dev.usbharu.owl.broker.external.toUUID +import dev.usbharu.owl.broker.service.PublishTask +import dev.usbharu.owl.broker.service.TaskPublishService +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.property.PropertySerializerFactory +import io.grpc.Status +import io.grpc.StatusException +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +@Singleton +class TaskPublishService( + coroutineContext: CoroutineContext = EmptyCoroutineContext, + private val taskPublishService: TaskPublishService, + private val propertySerializerFactory: PropertySerializerFactory +) : + TaskPublishServiceCoroutineImplBase(coroutineContext) { + + override suspend fun publishTask(request: PublishTaskOuterClass.PublishTask): PublishedTask { + + logger.warn("aaaaaaaaaaa") + + + + return try { + + val publishedTask = taskPublishService.publishTask( + PublishTask( + request.name, + request.producerId.toUUID(), + PropertySerializeUtils.deserialize(propertySerializerFactory, request.propertiesMap) + ) + ) + PublishedTask.newBuilder().setName(publishedTask.name).setId(publishedTask.id.toUUID()).build() + }catch (e:Error){ + logger.warn("exception ",e) + throw StatusException(Status.INTERNAL) + } + + + } + + companion object{ + private val logger = LoggerFactory.getLogger(dev.usbharu.owl.broker.interfaces.grpc.TaskPublishService::class.java) + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt new file mode 100644 index 00000000..8e89722f --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.consumer.ConsumerRepository +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.emitAll +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.take +import org.koin.core.annotation.Singleton +import java.util.* +interface AssignQueuedTaskDecider { + fun findAssignableQueue(consumerId: UUID, numberOfConcurrent: Int): Flow +} +@Singleton +class AssignQueuedTaskDeciderImpl( + private val consumerRepository: ConsumerRepository, + private val queueStore: QueueStore +) : AssignQueuedTaskDecider { + override fun findAssignableQueue(consumerId: UUID, numberOfConcurrent: Int): Flow { + return flow { + val consumer = consumerRepository.findById(consumerId) ?: TODO() + emitAll( + queueStore.findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( + consumer.tasks, + numberOfConcurrent + ).take(numberOfConcurrent) + ) + } + + } + +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt new file mode 100644 index 00000000..62bb6df3 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.consumer.Consumer +import dev.usbharu.owl.broker.domain.model.consumer.ConsumerRepository +import org.koin.core.annotation.Single +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory +import java.util.* + +interface ConsumerService { + suspend fun registerConsumer(registerConsumerRequest: RegisterConsumerRequest): UUID +} + +@Singleton +class ConsumerServiceImpl(private val consumerRepository: ConsumerRepository) : ConsumerService { + override suspend fun registerConsumer(registerConsumerRequest: RegisterConsumerRequest): UUID { + val id = UUID.randomUUID() + + consumerRepository.save( + Consumer( + id, + registerConsumerRequest.name, + registerConsumerRequest.hostname, + registerConsumerRequest.tasks + ) + ) + + logger.info( + "Register a new Consumer. name: {} hostname: {} tasks: {}", + registerConsumerRequest.name, + registerConsumerRequest.hostname, + registerConsumerRequest.tasks.size + ) + + return id + } + + companion object { + private val logger = LoggerFactory.getLogger(ConsumerServiceImpl::class.java) + } +} + +data class RegisterConsumerRequest( + val name: String, + val hostname: String, + val tasks: List +) \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt new file mode 100644 index 00000000..1c803a02 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.producer.Producer +import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory +import java.time.Instant +import java.util.* + +interface ProducerService { + suspend fun registerProducer(producer: RegisterProducerRequest):UUID +} + +@Singleton +class ProducerServiceImpl(private val producerRepository: ProducerRepository) : ProducerService { + override suspend fun registerProducer(producer: RegisterProducerRequest): UUID { + + val id = UUID.randomUUID() + + val saveProducer = Producer( + id = id, + name = producer.name, + hostname = producer.hostname, + registeredTask = emptyList(), + createdAt = Instant.now() + ) + + producerRepository.save(saveProducer) + + logger.info("Register a new Producer. name: {} hostname: {}",saveProducer.name,saveProducer.hostname) + return id + } + + companion object{ + private val logger = LoggerFactory.getLogger(ProducerServiceImpl::class.java) + } +} + +data class RegisterProducerRequest( + val name: String, + val hostname: String +) \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt new file mode 100644 index 00000000..bb49f6b8 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTaskRepository +import kotlinx.coroutines.flow.Flow +import org.koin.core.annotation.Singleton + +interface QueueStore { + suspend fun enqueue(queuedTask: QueuedTask) + suspend fun enqueueAll(queuedTaskList: List) + + suspend fun dequeue(queuedTask: QueuedTask) + suspend fun dequeueAll(queuedTaskList: List) + fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks: List, limit: Int): Flow +} + +@Singleton +class QueueStoreImpl(private val queuedTaskRepository: QueuedTaskRepository) : QueueStore { + override suspend fun enqueue(queuedTask: QueuedTask) { + queuedTaskRepository.save(queuedTask) + } + + override suspend fun enqueueAll(queuedTaskList: List) { + queuedTaskList.forEach { enqueue(it) } + } + + override suspend fun dequeue(queuedTask: QueuedTask) { + queuedTaskRepository.findByTaskIdAndAssignedConsumerIsNullAndUpdate(queuedTask.task.id, queuedTask) + } + + override suspend fun dequeueAll(queuedTaskList: List) { + return queuedTaskList.forEach { dequeue(it) } + } + + override fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( + tasks: List, + limit: Int + ): Flow { + return queuedTaskRepository.findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks, limit) + } + +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt new file mode 100644 index 00000000..40dde20f --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.onEach +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory +import java.time.Instant +import java.util.* + +interface QueuedTaskAssigner { + fun ready(consumerId: UUID,numberOfConcurrent:Int): Flow +} + +@Singleton +class QueuedTaskAssignerImpl( + private val taskManagementService: TaskManagementService, + private val queueStore: QueueStore +) : QueuedTaskAssigner{ + override fun ready(consumerId: UUID, numberOfConcurrent: Int): Flow { + return flow { + taskManagementService.findAssignableTask(consumerId, numberOfConcurrent) + .onEach { + val assignTask = assignTask(it, consumerId) + + if (assignTask != null) { + emit(assignTask) + } + } + .collect() + } + } + + private suspend fun assignTask(queuedTask: QueuedTask,consumerId: UUID):QueuedTask?{ + return try { + + val assignedTaskQueue = queuedTask.copy(assignedConsumer = consumerId, assignedAt = Instant.now()) + logger.trace("Try assign task: {} id: {} consumer: {}",queuedTask.task.name,queuedTask.task.id,consumerId) + + queueStore.dequeue(assignedTaskQueue) + + logger.debug( + "Assign Task. name: {} id: {} attempt: {} consumer: {}", + queuedTask.task.name, + queuedTask.task.id, + queuedTask.attempt, + queuedTask.assignedConsumer + ) + assignedTaskQueue + } catch (e: Exception) { + TODO("Not yet implemented") + } + } + + companion object{ + private val logger = LoggerFactory.getLogger(QueuedTaskAssignerImpl::class.java) + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt new file mode 100644 index 00000000..c3b8c465 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory + +interface RegisterTaskService { + suspend fun registerTask(taskDefinition: TaskDefinition) + + suspend fun unregisterTask(name:String) +} + +@Singleton +class RegisterTaskServiceImpl(private val taskDefinitionRepository: TaskDefinitionRepository) : RegisterTaskService { + override suspend fun registerTask(taskDefinition: TaskDefinition) { + taskDefinitionRepository.save(taskDefinition) + + logger.info("Register a new task. name: {}",taskDefinition.name) + } + + // todo すでにpublish済みのタスクをどうするか決めさせる + override suspend fun unregisterTask(name: String) { + taskDefinitionRepository.deleteByName(name) + + logger.info("Unregister a task. name: {}",name) + } + + companion object{ + private val logger = LoggerFactory.getLogger(RegisterTaskServiceImpl::class.java) + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt new file mode 100644 index 00000000..fb4c6676 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import java.time.Instant +import kotlin.math.pow +import kotlin.math.roundToLong + +interface RetryPolicy { + fun nextRetry(now: Instant, attempt: Int): Instant +} + +class ExponentialRetryPolicy(private val firstRetrySeconds: Int = 30) : RetryPolicy { + override fun nextRetry(now: Instant, attempt: Int): Instant = + now.plusSeconds(firstRetrySeconds.toDouble().pow(attempt + 1.0).roundToLong()) + +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt new file mode 100644 index 00000000..86ad27be --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +interface RetryPolicyFactory { + fun factory(name:String):RetryPolicy +} + +class DefaultRetryPolicyFactory(private val map: Map) : RetryPolicyFactory { + override fun factory(name: String): RetryPolicy { + return map[name]?: ExponentialRetryPolicy() + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt new file mode 100644 index 00000000..d5751249 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask +import dev.usbharu.owl.broker.domain.model.task.Task +import dev.usbharu.owl.broker.domain.model.task.TaskRepository +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.onEach +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory +import java.time.Instant +import java.util.* + + +interface TaskManagementService { + + suspend fun startManagement() + fun findAssignableTask(consumerId: UUID, numberOfConcurrent: Int): Flow +} + +@Singleton +class TaskManagementServiceImpl( + private val taskScanner: TaskScanner, + private val queueStore: QueueStore, + private val taskDefinitionRepository: TaskDefinitionRepository, + private val assignQueuedTaskDecider: AssignQueuedTaskDecider, + private val retryPolicyFactory: RetryPolicyFactory, + private val taskRepository: TaskRepository +) : TaskManagementService { + + private var flow:Flow = flowOf() + override suspend fun startManagement() { + flow = taskScanner.startScan() + + flow.onEach { + enqueueTask(it) + }.collect() + + } + + + override fun findAssignableTask(consumerId: UUID, numberOfConcurrent: Int): Flow { + return assignQueuedTaskDecider.findAssignableQueue(consumerId, numberOfConcurrent) + } + + private suspend fun enqueueTask(task: Task):QueuedTask{ + + val queuedTask = QueuedTask( + task.attempt + 1, + Instant.now(), + task, + null, + null + ) + + val copy = task.copy( + nextRetry = retryPolicyFactory.factory(taskDefinitionRepository.findByName(task.name)?.retryPolicy.orEmpty()) + .nextRetry(Instant.now(), task.attempt) + ) + + taskRepository.save(copy) + + queueStore.enqueue(queuedTask) + logger.debug("Enqueue Task. {} {}", task.name, task.id) + return queuedTask + } + + companion object{ + private val logger = LoggerFactory.getLogger(TaskManagementServiceImpl::class.java) + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt new file mode 100644 index 00000000..1aee8a64 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.task.Task +import dev.usbharu.owl.broker.domain.model.task.TaskRepository +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository +import dev.usbharu.owl.common.property.PropertyValue +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory +import java.time.Instant +import java.util.* + +interface TaskPublishService { + suspend fun publishTask(publishTask: PublishTask): PublishedTask +} + +data class PublishTask( + val name: String, + val producerId: UUID, + val properties: Map +) + +data class PublishedTask( + val name: String, + val id: UUID +) + +@Singleton +class TaskPublishServiceImpl( + private val taskRepository: TaskRepository, + private val taskDefinitionRepository:TaskDefinitionRepository, + private val retryPolicyFactory: RetryPolicyFactory +) : TaskPublishService { + override suspend fun publishTask(publishTask: PublishTask): PublishedTask { + val id = UUID.randomUUID() + + val definition = taskDefinitionRepository.findByName(publishTask.name) ?: TODO() + + val published = Instant.now() + val nextRetry = retryPolicyFactory.factory(definition.name).nextRetry(published,0) + + val task = Task( + name = publishTask.name, + id = id, + publishProducerId = publishTask.producerId, + publishedAt = published, + completedAt = null, + attempt = 0, + properties = publishTask.properties, + nextRetry = nextRetry + ) + + taskRepository.save(task) + + logger.debug("Published task #{} name: {}", task.id, task.name) + + return PublishedTask( + name = publishTask.name, + id = id + ) + } + + companion object { + private val logger = LoggerFactory.getLogger(TaskPublishServiceImpl::class.java) + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt new file mode 100644 index 00000000..ff579e5c --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.task.Task +import dev.usbharu.owl.broker.domain.model.task.TaskRepository +import kotlinx.coroutines.currentCoroutineContext +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.emitAll +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.isActive +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory +import java.time.Instant + +interface TaskScanner { + + fun startScan(): Flow +} + +@Singleton +class TaskScannerImpl(private val taskRepository: TaskRepository) : + TaskScanner { + + override fun startScan(): Flow = flow { + while (currentCoroutineContext().isActive) { + emitAll(scanTask()) + delay(500) + } + } + + private fun scanTask(): Flow { + return taskRepository.findByNextRetryBefore(Instant.now()) + } + + companion object { + private val logger = LoggerFactory.getLogger(TaskScannerImpl::class.java) + } +} \ No newline at end of file diff --git a/broker/src/main/proto/consumer.proto b/broker/src/main/proto/consumer.proto new file mode 100644 index 00000000..252d4a27 --- /dev/null +++ b/broker/src/main/proto/consumer.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; +import "uuid.proto"; + +option java_package = "dev.usbharu.owl"; + +message SubscribeTaskRequest { + string name = 1; + string hostname = 2; + repeated string tasks = 3;; +} + +message SubscribeTaskResponse { + UUID id = 1; +} + +service SubscribeTaskService { + rpc SubscribeTask (SubscribeTaskRequest) returns (SubscribeTaskResponse); +} \ No newline at end of file diff --git a/broker/src/main/proto/definition_task.proto b/broker/src/main/proto/definition_task.proto new file mode 100644 index 00000000..6cab5257 --- /dev/null +++ b/broker/src/main/proto/definition_task.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; + +option java_package = "dev.usbharu.owl"; + +import "google/protobuf/empty.proto"; +import "uuid.proto"; + + +message TaskDefinition { + string name = 1; + int32 priority = 2; + int32 max_retry = 3; + int64 timeout_milli = 4; + int64 property_definition_hash = 5; + UUID producer_id = 6; + string retryPolicy = 7; +} + +message TaskDefined { + string task_id = 1; +} + +message TaskUnregister { + string name = 1; + UUID producer_id = 2; +} + +service DefinitionTaskService { + rpc register(TaskDefinition) returns (TaskDefined); + rpc unregister(TaskUnregister) returns (google.protobuf.Empty); +} \ No newline at end of file diff --git a/broker/src/main/proto/producer.proto b/broker/src/main/proto/producer.proto new file mode 100644 index 00000000..b4bbcd7a --- /dev/null +++ b/broker/src/main/proto/producer.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; + +import "uuid.proto"; + +option java_package = "dev.usbharu.owl"; + +message Producer { + string name = 1; + string hostname = 2; +} + +message RegisterProducerResponse { + UUID id = 1; +} + +service ProducerService { + rpc registerProducer (Producer) returns (RegisterProducerResponse); +} \ No newline at end of file diff --git a/broker/src/main/proto/property.proto b/broker/src/main/proto/property.proto new file mode 100644 index 00000000..138e7e22 --- /dev/null +++ b/broker/src/main/proto/property.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +import "google/protobuf/empty.proto"; + +option java_package = "dev.usbharu.owl"; + +message Property{ + oneof value { + google.protobuf.Empty empty = 1; + string string = 2; + int32 integer = 3; + } +} \ No newline at end of file diff --git a/broker/src/main/proto/publish_task.proto b/broker/src/main/proto/publish_task.proto new file mode 100644 index 00000000..447a4bc4 --- /dev/null +++ b/broker/src/main/proto/publish_task.proto @@ -0,0 +1,25 @@ +syntax = "proto3"; + +import "google/protobuf/timestamp.proto"; + +import "uuid.proto"; +import "property.proto"; + +option java_package = "dev.usbharu.owl"; + + +message PublishTask { + string name = 1; + google.protobuf.Timestamp publishedAt = 2; + map properties = 3; + UUID producer_id = 4; +} + +message PublishedTask { + string name = 1; + UUID id = 2; +} + +service TaskPublishService { + rpc publishTask (PublishTask) returns (PublishedTask); +} diff --git a/broker/src/main/proto/task.proto b/broker/src/main/proto/task.proto new file mode 100644 index 00000000..48566fdb --- /dev/null +++ b/broker/src/main/proto/task.proto @@ -0,0 +1,23 @@ +syntax = "proto3"; +import "uuid.proto"; +import "google/protobuf/timestamp.proto"; +import "property.proto"; + +option java_package = "dev.usbharu.owl"; + +message ReadyRequest { + int32 number_of_concurrent = 1; + UUID consumer_id = 2; +} + +message TaskRequest { + string name = 1; + UUID id = 2; + int32 attempt = 4; + google.protobuf.Timestamp queuedAt = 5; + map properties = 6; +} + +service AssignmentTaskService { + rpc ready (stream ReadyRequest) returns (stream TaskRequest); +} \ No newline at end of file diff --git a/broker/src/main/proto/task_result.proto b/broker/src/main/proto/task_result.proto new file mode 100644 index 00000000..43a07aed --- /dev/null +++ b/broker/src/main/proto/task_result.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +import "uuid.proto"; +import "google/protobuf/empty.proto"; +import "property.proto"; + +option java_package = "dev.usbharu.owl"; + +message TaskResult { + UUID id = 1; + bool success = 2; + int32 attempt = 3; + map result = 4; +} \ No newline at end of file diff --git a/broker/src/main/proto/uuid.proto b/broker/src/main/proto/uuid.proto new file mode 100644 index 00000000..26d61001 --- /dev/null +++ b/broker/src/main/proto/uuid.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +option java_package = "dev.usbharu.owl"; + +message UUID { + uint64 most_significant_uuid_bits = 1; + uint64 least_significant_uuid_bits = 2; +} \ No newline at end of file diff --git a/broker/src/main/resources/log4j2.xml b/broker/src/main/resources/log4j2.xml new file mode 100644 index 00000000..e202a6fa --- /dev/null +++ b/broker/src/main/resources/log4j2.xml @@ -0,0 +1,40 @@ + + + + + + + %d{yyyy/MM/dd HH:mm:ss.SSS} [%t] %-6p %c{10}#%M:%L | %m%n + + + + + ${format1} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt b/broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt new file mode 100644 index 00000000..6d968be7 --- /dev/null +++ b/broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt @@ -0,0 +1,13 @@ +package dev.usbharu.owl.broker.service + +import org.junit.jupiter.api.Test + +class TaskManagementServiceImplTest { + + @Test + fun findAssignableTask() { + val taskManagementServiceImpl = TaskManagementServiceImpl() + + Thread.sleep(10000) + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..35030563 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,37 @@ +plugins { + kotlin("jvm") version "1.9.22" +} + + +allprojects { + group = "dev.usbharu" + version = "0.0.1" + + + repositories { + mavenCentral() + } +} + +subprojects { + apply { + plugin("org.jetbrains.kotlin.jvm") + } + kotlin { + jvmToolchain(17) + } + + dependencies { + implementation("org.slf4j:slf4j-api:2.0.12") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + + + } + + + tasks.test { + useJUnitPlatform() + } + + +} \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 00000000..58cc5412 --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("jvm") +} + +group = "dev.usbharu" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation("org.jetbrains.kotlin:kotlin-test") +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt new file mode 100644 index 00000000..40984107 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.property + +class IntegerPropertyValue(override val value: Int) : PropertyValue() { + override val type: PropertyType + get() = PropertyType.integer +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt new file mode 100644 index 00000000..b5e151d3 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.property + +object PropertySerializeUtils { + fun serialize( + serializerFactory: PropertySerializerFactory, + properties: Map + ): Map = + properties.map { it.key to serializerFactory.factory(it.value).serialize(it.value) }.toMap() + + fun deserialize( + serializerFactory: PropertySerializerFactory, + properties: Map + ): Map = + properties.map { it.key to serializerFactory.factory(it.value).deserialize(it.value) }.toMap() +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt new file mode 100644 index 00000000..85194fea --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.property + +interface PropertySerializer { + fun isSupported(propertyValue: PropertyValue): Boolean + fun isSupported(string: String): Boolean + fun serialize(propertyValue: PropertyValue): String + + fun deserialize(string: String): PropertyValue +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt new file mode 100644 index 00000000..9caaa8a3 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.property + +interface PropertySerializerFactory { + fun factory(propertyValue: PropertyValue): PropertySerializer + fun factory(string: String): PropertySerializer +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactoryImpl.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactoryImpl.kt new file mode 100644 index 00000000..f891f7ad --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactoryImpl.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.property + + +class PropertySerializerFactoryImpl : PropertySerializerFactory { + override fun factory(propertyValue: PropertyValue): PropertySerializer { + TODO("Not yet implemented") + } + + override fun factory(string: String): PropertySerializer { + TODO("Not yet implemented") + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt new file mode 100644 index 00000000..66941146 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.property + +enum class PropertyType { + integer, + string +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt new file mode 100644 index 00000000..6b7f392d --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.property + +sealed class PropertyValue { + abstract val value:Any + abstract val type: PropertyType +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt b/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt new file mode 100644 index 00000000..9042917a --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.retry + +interface RetryPolicy { +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt new file mode 100644 index 00000000..44c149b2 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.task + +import dev.usbharu.owl.common.property.PropertyType + +class PropertyDefinition(val map: Map) : Map by map{ + +} diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt new file mode 100644 index 00000000..57d55ecb --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.task + +import java.time.Instant +import java.util.UUID + +data class PublishedTask( + val task: T, + val id: UUID, + val published: Instant +) \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt new file mode 100644 index 00000000..2f196e8e --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.task + +open class Task { +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt new file mode 100644 index 00000000..6a8e7f32 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.task + +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.retry.RetryPolicy + +interface TaskDefinition { + val name: String + val priority: Int + val maxRetry: Int + val retryPolicy:RetryPolicy + val timeoutMilli: Long + val propertyDefinition: PropertyDefinition + + fun serialize(task: T): Map + fun deserialize(value: Map): T +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..7fc6f1ff --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +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 ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +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" || "$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 + 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 + # 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 +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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 new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/producer/api/build.gradle.kts b/producer/api/build.gradle.kts new file mode 100644 index 00000000..7e049bf8 --- /dev/null +++ b/producer/api/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("jvm") +} + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + api(project(":common")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} \ No newline at end of file diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt new file mode 100644 index 00000000..e4df89ab --- /dev/null +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.producer.api + +import dev.usbharu.owl.common.task.PublishedTask +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition + +interface OwlProducer { + + suspend fun registerTask(taskDefinition: TaskDefinition) + suspend fun publishTask(task: T): PublishedTask +} diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerFactory.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerFactory.kt new file mode 100644 index 00000000..419689bf --- /dev/null +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerFactory.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.producer.api + +object OwlProducerFactory { + fun createProducer():OwlProducer{ + TODO() + } +} \ No newline at end of file diff --git a/producer/impl/build.gradle.kts b/producer/impl/build.gradle.kts new file mode 100644 index 00000000..87bf53a1 --- /dev/null +++ b/producer/impl/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("jvm") +} + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + implementation(project(":producer:api")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt new file mode 100644 index 00000000..1607a62b --- /dev/null +++ b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.producer.impl + +import dev.usbharu.owl.common.task.PublishedTask +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition +import dev.usbharu.owl.producer.api.OwlProducer + +class DefaultOwlProducer : OwlProducer { + override suspend fun registerTask(taskDefinition: TaskDefinition) { + TODO("Not yet implemented") + } + + override suspend fun publishTask(task: T): PublishedTask { + TODO("Not yet implemented") + } +} \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt new file mode 100644 index 00000000..7c9410aa --- /dev/null +++ b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.producer.impl + +import dev.usbharu.owl.common.task.PublishedTask +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition + +interface OwlTaskDatasource { + + suspend fun registerTask(definition: TaskDefinition) + suspend fun publishTask(publishedTask: PublishedTask) +} \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt new file mode 100644 index 00000000..293ba15b --- /dev/null +++ b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.producer.impl.datasource + +import dev.usbharu.producer.impl.OwlTaskDatasource + +interface DatasourceFactory { + suspend fun create():OwlTaskDatasource +} \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt new file mode 100644 index 00000000..f198a270 --- /dev/null +++ b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.producer.impl.datasource + +import dev.usbharu.producer.impl.OwlTaskDatasource +import java.util.ServiceLoader +import kotlin.jvm.optionals.getOrElse +import kotlin.jvm.optionals.getOrNull + +class ServiceProviderDatasourceFactory : DatasourceFactory { + override suspend fun create(): OwlTaskDatasource { + val serviceLoader: ServiceLoader = ServiceLoader.load(OwlTaskDatasource::class.java) + + return serviceLoader.findFirst().getOrElse { + throw IllegalStateException("") + } + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..8e2a06bc --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} +rootProject.name = "owl" +include("common") +include("producer:api") +findProject(":producer:api")?.name = "api" +include("producer:impl") +findProject(":producer:impl")?.name = "impl" +include("broker") +include("broker:broker-mongodb") +findProject(":broker:broker-mongodb")?.name = "broker-mongodb" From 34dc90b937d4e846fb550b7d2f51277f39f56cdb Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:04:04 +0900 Subject: [PATCH 02/36] =?UTF-8?q?chore:=20=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=83=91=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/broker-mongodb/build.gradle.kts | 7 ++++++- broker/build.gradle.kts | 1 - broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/broker/broker-mongodb/build.gradle.kts b/broker/broker-mongodb/build.gradle.kts index 8268414e..cd25913e 100644 --- a/broker/broker-mongodb/build.gradle.kts +++ b/broker/broker-mongodb/build.gradle.kts @@ -1,4 +1,5 @@ plugins { + application kotlin("jvm") id("com.google.devtools.ksp") version "1.9.22-1.0.17" } @@ -16,7 +17,7 @@ repositories { dependencies { implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0") - compileOnly(project(":broker")) + implementation(project(":broker")) implementation(project(":common")) implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) @@ -30,4 +31,8 @@ tasks.test { } kotlin { jvmToolchain(17) +} + +application { + mainClass = "dev.usbharu.owl.broker.MainKt" } \ No newline at end of file diff --git a/broker/build.gradle.kts b/broker/build.gradle.kts index c16d61b7..393de63f 100644 --- a/broker/build.gradle.kts +++ b/broker/build.gradle.kts @@ -25,7 +25,6 @@ dependencies { implementation("org.mongodb:mongodb-driver-kotlin-coroutine:4.11.0") implementation("org.mongodb:bson-kotlinx:4.11.0") implementation(project(":common")) - runtimeOnly(project(":broker:broker-mongodb")) implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt index 4241cafb..fa01f686 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -35,7 +35,6 @@ fun main() { Class.forName("dev.usbharu.owl.broker.mongodb.MongoModuleContext").newInstance() as ModuleContext - // println(File(Thread.currentThread().contextClassLoader.getResource("dev/usbharu/owl/broker/mongodb").file).listFiles().joinToString()) val koin = startKoin { @@ -44,7 +43,8 @@ fun main() { val module = module { single { val clientSettings = - MongoClientSettings.builder().applyConnectionString(ConnectionString("mongodb://localhost:27017")) + MongoClientSettings.builder() + .applyConnectionString(ConnectionString("mongodb://agent1.build:27017")) .uuidRepresentation(UuidRepresentation.STANDARD).build() @@ -57,7 +57,7 @@ fun main() { DefaultRetryPolicyFactory(emptyMap()) } } - modules(module,defaultModule, moduleContext.module()) + modules(module, defaultModule, moduleContext.module()) } val application = koin.koin.get() From a88c23d5cfd27eae545c63b69b679556afbe28dc Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:14:49 +0900 Subject: [PATCH 03/36] =?UTF-8?q?refactor:=20RetryPolicy=E3=82=92common?= =?UTF-8?q?=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC=E3=82=B8=E3=81=AE=E3=82=82?= =?UTF-8?q?=E3=81=AE=E3=81=AB=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usbharu/owl/broker/service/RetryPolicy.kt | 31 ------------------- .../owl/broker/service/RetryPolicyFactory.kt | 5 ++- .../common/retry/ExponentialRetryPolicy.kt | 11 +++++++ .../usbharu/owl/common/retry/RetryPolicy.kt | 3 ++ 4 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt deleted file mode 100644 index fb4c6676..00000000 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicy.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * 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 dev.usbharu.owl.broker.service - -import java.time.Instant -import kotlin.math.pow -import kotlin.math.roundToLong - -interface RetryPolicy { - fun nextRetry(now: Instant, attempt: Int): Instant -} - -class ExponentialRetryPolicy(private val firstRetrySeconds: Int = 30) : RetryPolicy { - override fun nextRetry(now: Instant, attempt: Int): Instant = - now.plusSeconds(firstRetrySeconds.toDouble().pow(attempt + 1.0).roundToLong()) - -} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt index 86ad27be..3b4d8519 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt @@ -16,8 +16,11 @@ package dev.usbharu.owl.broker.service +import dev.usbharu.owl.common.retry.ExponentialRetryPolicy +import dev.usbharu.owl.common.retry.RetryPolicy + interface RetryPolicyFactory { - fun factory(name:String):RetryPolicy + fun factory(name: String): RetryPolicy } class DefaultRetryPolicyFactory(private val map: Map) : RetryPolicyFactory { diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt new file mode 100644 index 00000000..60180dd3 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt @@ -0,0 +1,11 @@ +package dev.usbharu.owl.common.retry + +import java.time.Instant +import kotlin.math.pow +import kotlin.math.roundToLong + +class ExponentialRetryPolicy(private val firstRetrySeconds: Int = 30) : RetryPolicy { + override fun nextRetry(now: Instant, attempt: Int): Instant = + now.plusSeconds(firstRetrySeconds.toDouble().pow(attempt + 1.0).roundToLong()) + +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt b/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt index 9042917a..04a73a00 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt @@ -16,5 +16,8 @@ package dev.usbharu.owl.common.retry +import java.time.Instant + interface RetryPolicy { + fun nextRetry(now: Instant, attempt: Int): Instant } \ No newline at end of file From 4e8126ee06b8ad167c5fb28423585215b78519b6 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:32:30 +0900 Subject: [PATCH 04/36] =?UTF-8?q?feat:=20SPI=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=97=E3=81=A6ModuleContext=E3=82=92=E8=AA=AD=E3=81=BF?= =?UTF-8?q?=E8=BE=BC=E3=82=80=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../owl/broker/mongodb/MongoModuleContext.kt | 18 +++++++++++++++- .../dev.usbharu.owl.broker.ModuleContext | 1 + .../kotlin/dev/usbharu/owl/broker/Main.kt | 21 ++----------------- 3 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 broker/broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt index 0fa424d3..6a374362 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt @@ -16,11 +16,27 @@ package dev.usbharu.owl.broker.mongodb +import com.mongodb.ConnectionString +import com.mongodb.MongoClientSettings +import com.mongodb.kotlin.client.coroutine.MongoClient import dev.usbharu.owl.broker.ModuleContext +import org.bson.UuidRepresentation import org.koin.ksp.generated.module class MongoModuleContext : ModuleContext { override fun module(): org.koin.core.module.Module { - return MongoModule().module + val module = MongoModule().module + module.includes(org.koin.dsl.module { + single { + val clientSettings = + MongoClientSettings.builder() + .applyConnectionString(ConnectionString("mongodb://agent1.build:27017")) + .uuidRepresentation(UuidRepresentation.STANDARD).build() + + + MongoClient.create(clientSettings).getDatabase("mongo-test") + } + }) + return module } } \ No newline at end of file diff --git a/broker/broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext b/broker/broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext new file mode 100644 index 00000000..0a1dface --- /dev/null +++ b/broker/broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext @@ -0,0 +1 @@ +dev.usbharu.owl.broker.mongodb.MongoModuleContext \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt index fa01f686..d5184bd1 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -16,40 +16,23 @@ package dev.usbharu.owl.broker -import com.mongodb.ConnectionString -import com.mongodb.MongoClientSettings -import com.mongodb.kotlin.client.coroutine.MongoClient import dev.usbharu.owl.broker.service.DefaultRetryPolicyFactory import dev.usbharu.owl.broker.service.RetryPolicyFactory import dev.usbharu.owl.common.property.PropertySerializerFactory import dev.usbharu.owl.common.property.PropertySerializerFactoryImpl import kotlinx.coroutines.runBlocking -import org.bson.UuidRepresentation import org.koin.core.context.startKoin import org.koin.dsl.module import org.koin.ksp.generated.defaultModule +import java.util.* fun main() { - - val moduleContext = - Class.forName("dev.usbharu.owl.broker.mongodb.MongoModuleContext").newInstance() as ModuleContext - - -// println(File(Thread.currentThread().contextClassLoader.getResource("dev/usbharu/owl/broker/mongodb").file).listFiles().joinToString()) + val moduleContext = ServiceLoader.load(ModuleContext::class.java).first() val koin = startKoin { printLogger() val module = module { - single { - val clientSettings = - MongoClientSettings.builder() - .applyConnectionString(ConnectionString("mongodb://agent1.build:27017")) - .uuidRepresentation(UuidRepresentation.STANDARD).build() - - - MongoClient.create(clientSettings).getDatabase("mongo-test") - } single { PropertySerializerFactoryImpl() } From 7043462b584b532adbad5004d6113cde841e012c Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:47:01 +0900 Subject: [PATCH 05/36] =?UTF-8?q?feat:=20=E3=82=B7=E3=82=B9=E3=83=86?= =?UTF-8?q?=E3=83=A0=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3=E3=81=8B?= =?UTF-8?q?=E3=82=89MongoDB=E3=81=B8=E3=81=AE=E6=8E=A5=E7=B6=9A=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../owl/broker/mongodb/MongoModuleContext.kt | 18 ++++++++++++++---- broker/build.gradle.kts | 2 -- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt index 6a374362..eece963a 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt @@ -21,20 +21,30 @@ import com.mongodb.MongoClientSettings import com.mongodb.kotlin.client.coroutine.MongoClient import dev.usbharu.owl.broker.ModuleContext import org.bson.UuidRepresentation +import org.koin.core.module.Module +import org.koin.dsl.module import org.koin.ksp.generated.module class MongoModuleContext : ModuleContext { - override fun module(): org.koin.core.module.Module { + override fun module(): Module { val module = MongoModule().module - module.includes(org.koin.dsl.module { + module.includes(module { single { val clientSettings = MongoClientSettings.builder() - .applyConnectionString(ConnectionString("mongodb://agent1.build:27017")) + .applyConnectionString( + ConnectionString( + System.getProperty( + "owl.broker.mongo.url", + "mongodb://agent1.build:27017" + ) + ) + ) .uuidRepresentation(UuidRepresentation.STANDARD).build() - MongoClient.create(clientSettings).getDatabase("mongo-test") + MongoClient.create(clientSettings) + .getDatabase(System.getProperty("owl.broker.mongo.database", "mongo-test")) } }) return module diff --git a/broker/build.gradle.kts b/broker/build.gradle.kts index 393de63f..1d3d402e 100644 --- a/broker/build.gradle.kts +++ b/broker/build.gradle.kts @@ -22,8 +22,6 @@ dependencies { implementation("com.google.protobuf:protobuf-kotlin:3.25.3") implementation("io.grpc:grpc-netty:1.61.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") - implementation("org.mongodb:mongodb-driver-kotlin-coroutine:4.11.0") - implementation("org.mongodb:bson-kotlinx:4.11.0") implementation(project(":common")) implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") implementation(platform("io.insert-koin:koin-bom:3.5.3")) From 63fa08fd69ac0cec30675a5f93b14f5e0e8ed802 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:26:55 +0900 Subject: [PATCH 06/36] =?UTF-8?q?Property=E3=82=92=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=83=8D=E3=83=AA=E3=83=83=E3=82=AF=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=97=E3=81=A6=E5=9E=8B=E5=AE=89=E5=85=A8=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/owl/broker/Main.kt | 5 ----- .../owl/broker/domain/model/task/Task.kt | 2 +- .../DefaultPropertySerializerFactory.kt | 9 +++++++++ .../owl/broker/service/TaskPublishService.kt | 2 +- ....kt => CustomPropertySerializerFactory.kt} | 11 +++++----- .../common/property/IntegerPropertyValue.kt | 20 ++++++++++++++++++- .../common/property/PropertySerializeUtils.kt | 4 ++-- .../owl/common/property/PropertySerializer.kt | 8 ++++---- .../property/PropertySerializerFactory.kt | 4 ++-- .../owl/common/property/PropertyValue.kt | 4 ++-- .../usbharu/owl/common/task/TaskDefinition.kt | 4 ++-- 11 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt rename common/src/main/kotlin/dev/usbharu/owl/common/property/{PropertySerializerFactoryImpl.kt => CustomPropertySerializerFactory.kt} (58%) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt index d5184bd1..83cbaacd 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -18,8 +18,6 @@ package dev.usbharu.owl.broker import dev.usbharu.owl.broker.service.DefaultRetryPolicyFactory import dev.usbharu.owl.broker.service.RetryPolicyFactory -import dev.usbharu.owl.common.property.PropertySerializerFactory -import dev.usbharu.owl.common.property.PropertySerializerFactoryImpl import kotlinx.coroutines.runBlocking import org.koin.core.context.startKoin import org.koin.dsl.module @@ -33,9 +31,6 @@ fun main() { printLogger() val module = module { - single { - PropertySerializerFactoryImpl() - } single { DefaultRetryPolicyFactory(emptyMap()) } diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt index 07347c05..8bf3a162 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt @@ -31,5 +31,5 @@ data class Task( val nextRetry:Instant, val completedAt: Instant? = null, val attempt: Int, - val properties: Map + val properties: Map> ) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt new file mode 100644 index 00000000..b78fa47f --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt @@ -0,0 +1,9 @@ +package dev.usbharu.owl.broker.service + +import dev.usbharu.owl.common.property.CustomPropertySerializerFactory +import dev.usbharu.owl.common.property.IntegerPropertySerializer +import dev.usbharu.owl.common.property.PropertySerializerFactory +import org.koin.core.annotation.Singleton + +@Singleton(binds = [PropertySerializerFactory::class]) +class DefaultPropertySerializerFactory : CustomPropertySerializerFactory(setOf(IntegerPropertySerializer())) \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt index 1aee8a64..288bc16b 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt @@ -32,7 +32,7 @@ interface TaskPublishService { data class PublishTask( val name: String, val producerId: UUID, - val properties: Map + val properties: Map> ) data class PublishedTask( diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactoryImpl.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt similarity index 58% rename from common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactoryImpl.kt rename to common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt index f891f7ad..3f3e8263 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactoryImpl.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt @@ -17,12 +17,13 @@ package dev.usbharu.owl.common.property -class PropertySerializerFactoryImpl : PropertySerializerFactory { - override fun factory(propertyValue: PropertyValue): PropertySerializer { - TODO("Not yet implemented") +open class CustomPropertySerializerFactory(private val propertySerializers: Set>) : + PropertySerializerFactory { + override fun factory(propertyValue: PropertyValue): PropertySerializer { + return propertySerializers.first { it.isSupported(propertyValue) } as PropertySerializer } - override fun factory(string: String): PropertySerializer { - TODO("Not yet implemented") + override fun factory(string: String): PropertySerializer<*> { + return propertySerializers.first { it.isSupported(string) } } } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt index 40984107..331f8f7d 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt @@ -16,7 +16,25 @@ package dev.usbharu.owl.common.property -class IntegerPropertyValue(override val value: Int) : PropertyValue() { +class IntegerPropertyValue(override val value: Int) : PropertyValue() { override val type: PropertyType get() = PropertyType.integer +} + +class IntegerPropertySerializer : PropertySerializer { + override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + return propertyValue.value is Int + } + + override fun isSupported(string: String): Boolean { + return string.startsWith("int32:") + } + + override fun serialize(propertyValue: PropertyValue<*>): String { + return "int32:" + propertyValue.value.toString() + } + + override fun deserialize(string: String): PropertyValue { + return IntegerPropertyValue(string.replace("int32:", "").toInt()) + } } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt index b5e151d3..38d7a4b8 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt @@ -19,13 +19,13 @@ package dev.usbharu.owl.common.property object PropertySerializeUtils { fun serialize( serializerFactory: PropertySerializerFactory, - properties: Map + properties: Map> ): Map = properties.map { it.key to serializerFactory.factory(it.value).serialize(it.value) }.toMap() fun deserialize( serializerFactory: PropertySerializerFactory, properties: Map - ): Map = + ): Map> = properties.map { it.key to serializerFactory.factory(it.value).deserialize(it.value) }.toMap() } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt index 85194fea..b1c3bb53 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt @@ -16,10 +16,10 @@ package dev.usbharu.owl.common.property -interface PropertySerializer { - fun isSupported(propertyValue: PropertyValue): Boolean +interface PropertySerializer { + fun isSupported(propertyValue: PropertyValue<*>): Boolean fun isSupported(string: String): Boolean - fun serialize(propertyValue: PropertyValue): String + fun serialize(propertyValue: PropertyValue<*>): String - fun deserialize(string: String): PropertyValue + fun deserialize(string: String): PropertyValue } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt index 9caaa8a3..bc18d270 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt @@ -17,6 +17,6 @@ package dev.usbharu.owl.common.property interface PropertySerializerFactory { - fun factory(propertyValue: PropertyValue): PropertySerializer - fun factory(string: String): PropertySerializer + fun factory(propertyValue: PropertyValue): PropertySerializer + fun factory(string: String): PropertySerializer<*> } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt index 6b7f392d..440aa356 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt @@ -16,7 +16,7 @@ package dev.usbharu.owl.common.property -sealed class PropertyValue { - abstract val value:Any +sealed class PropertyValue { + abstract val value: T abstract val type: PropertyType } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt index 6a8e7f32..8c766c34 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt @@ -27,6 +27,6 @@ interface TaskDefinition { val timeoutMilli: Long val propertyDefinition: PropertyDefinition - fun serialize(task: T): Map - fun deserialize(value: Map): T + fun serialize(task: T): Map> + fun deserialize(value: Map>): T } \ No newline at end of file From f917809b7795ebfee770daa1b3f889777d07d782 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:31:05 +0900 Subject: [PATCH 07/36] =?UTF-8?q?chore:=20Gradle=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle.properties b/gradle.properties index 7fc6f1ff..c02d6c9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,5 @@ kotlin.code.style=official +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.configureondemand=true + From 20d6cf3c320c383307bf3c01a896855a2a6ed80b Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:51:09 +0900 Subject: [PATCH 08/36] =?UTF-8?q?feat:=20PropertySerializer=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DefaultPropertySerializerFactory.kt | 14 +++++++---- .../common/property/BooleanPropertyValue.kt | 24 +++++++++++++++++++ .../common/property/DoublePropertyValue.kt | 24 +++++++++++++++++++ .../common/property/IntegerPropertyValue.kt | 2 +- .../owl/common/property/PropertyType.kt | 5 ++-- .../common/property/StringPropertyValue.kt | 24 +++++++++++++++++++ 6 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt create mode 100644 common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt index b78fa47f..3e34c65b 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt @@ -1,9 +1,15 @@ package dev.usbharu.owl.broker.service -import dev.usbharu.owl.common.property.CustomPropertySerializerFactory -import dev.usbharu.owl.common.property.IntegerPropertySerializer -import dev.usbharu.owl.common.property.PropertySerializerFactory +import dev.usbharu.owl.common.property.* import org.koin.core.annotation.Singleton @Singleton(binds = [PropertySerializerFactory::class]) -class DefaultPropertySerializerFactory : CustomPropertySerializerFactory(setOf(IntegerPropertySerializer())) \ No newline at end of file +class DefaultPropertySerializerFactory : + CustomPropertySerializerFactory( + setOf( + IntegerPropertySerializer(), + StringPropertyValueSerializer(), + DoublePropertySerializer(), + BooleanPropertySerializer() + ) + ) \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt new file mode 100644 index 00000000..0a04685a --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt @@ -0,0 +1,24 @@ +package dev.usbharu.owl.common.property + +class BooleanPropertyValue(override val value: Boolean) : PropertyValue() { + override val type: PropertyType + get() = PropertyType.binary +} + +class BooleanPropertySerializer : PropertySerializer { + override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + return propertyValue.value is Boolean + } + + override fun isSupported(string: String): Boolean { + return string.startsWith("bool:") + } + + override fun serialize(propertyValue: PropertyValue<*>): String { + return "bool:" + propertyValue.value.toString() + } + + override fun deserialize(string: String): PropertyValue { + return BooleanPropertyValue(string.replace("bool:", "").toBoolean()) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt new file mode 100644 index 00000000..13156f20 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt @@ -0,0 +1,24 @@ +package dev.usbharu.owl.common.property + +class DoublePropertyValue(override val value: Double) : PropertyValue() { + override val type: PropertyType + get() = PropertyType.number +} + +class DoublePropertySerializer : PropertySerializer { + override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + return propertyValue.value is Double + } + + override fun isSupported(string: String): Boolean { + return string.startsWith("double:") + } + + override fun serialize(propertyValue: PropertyValue<*>): String { + return "double:" + propertyValue.value.toString() + } + + override fun deserialize(string: String): PropertyValue { + return DoublePropertyValue(string.replace("double:", "").toDouble()) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt index 331f8f7d..42782069 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt @@ -18,7 +18,7 @@ package dev.usbharu.owl.common.property class IntegerPropertyValue(override val value: Int) : PropertyValue() { override val type: PropertyType - get() = PropertyType.integer + get() = PropertyType.number } class IntegerPropertySerializer : PropertySerializer { diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt index 66941146..c9dabae5 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt @@ -17,6 +17,7 @@ package dev.usbharu.owl.common.property enum class PropertyType { - integer, - string + number, + string, + binary } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt new file mode 100644 index 00000000..a7030d22 --- /dev/null +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt @@ -0,0 +1,24 @@ +package dev.usbharu.owl.common.property + +class StringPropertyValue(override val value: String) : PropertyValue() { + override val type: PropertyType + get() = PropertyType.string +} + +class StringPropertyValueSerializer : PropertySerializer { + override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + return propertyValue.value is String + } + + override fun isSupported(string: String): Boolean { + return string.startsWith("str:") + } + + override fun serialize(propertyValue: PropertyValue<*>): String { + return "str:" + propertyValue.value + } + + override fun deserialize(string: String): PropertyValue { + return StringPropertyValue(string.replace("str:", "")) + } +} \ No newline at end of file From 4ac8f614ec2f02a97fe167eb1c5a2ccb4c9c7b81 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 16:47:33 +0900 Subject: [PATCH 09/36] =?UTF-8?q?feat:=20=E3=83=87=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=88=E3=81=AE=E3=83=AA=E3=83=88=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=9D=E3=83=AA=E3=82=B7=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DefaultPropertySerializerFactory.kt | 16 +++++++++ .../common/retry/ExponentialRetryPolicy.kt | 2 +- .../retry/ExponentialRetryPolicyTest.kt | 36 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt index 3e34c65b..d35c6e06 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service import dev.usbharu.owl.common.property.* diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt index 60180dd3..8745fc1f 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt @@ -6,6 +6,6 @@ import kotlin.math.roundToLong class ExponentialRetryPolicy(private val firstRetrySeconds: Int = 30) : RetryPolicy { override fun nextRetry(now: Instant, attempt: Int): Instant = - now.plusSeconds(firstRetrySeconds.toDouble().pow(attempt + 1.0).roundToLong()) + now.plusSeconds(firstRetrySeconds.times((2.0).pow(attempt).roundToLong())) } \ No newline at end of file diff --git a/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt b/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt new file mode 100644 index 00000000..53ea7a15 --- /dev/null +++ b/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.common.retry + +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import java.time.Instant + +class ExponentialRetryPolicyTest { + @Test + fun exponential0() { + val nextRetry = ExponentialRetryPolicy().nextRetry(Instant.ofEpochSecond(300), 0) + + assertEquals(Instant.ofEpochSecond(330), nextRetry) + } + + @Test + fun exponential1() { + val nextRetry = ExponentialRetryPolicy().nextRetry(Instant.ofEpochSecond(300), 1) + assertEquals(Instant.ofEpochSecond(360), nextRetry) + } +} \ No newline at end of file From c17bd94f737f78c23cad26705f3344f8850461a0 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:46:36 +0900 Subject: [PATCH 10/36] =?UTF-8?q?feat:=20=E4=BE=8B=E5=A4=96=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/FailedSaveException.kt | 30 +++++++++++++++++++ .../repository/RecordNotFoundException.kt | 30 +++++++++++++++++++ .../service/IncompatibleTaskException.kt | 30 +++++++++++++++++++ .../service/QueueCannotDequeueException.kt | 30 +++++++++++++++++++ .../service/RetryPolicyNotFoundException.kt | 30 +++++++++++++++++++ .../service/TaskNotRegisterException.kt | 30 +++++++++++++++++++ .../broker/service/AssignQueuedTaskDecider.kt | 4 ++- .../owl/broker/service/QueuedTaskAssigner.kt | 6 ++-- .../owl/broker/service/RegisterTaskService.kt | 9 ++++++ .../owl/broker/service/RetryPolicyFactory.kt | 16 ++++++++-- .../broker/service/TaskManagementService.kt | 19 +++++++----- .../owl/broker/service/TaskPublishService.kt | 4 ++- 12 files changed, 223 insertions(+), 15 deletions(-) create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt new file mode 100644 index 00000000..4cb68305 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.exception.repository + +class FailedSaveException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt new file mode 100644 index 00000000..62921c46 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.exception.repository + +open class RecordNotFoundException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt new file mode 100644 index 00000000..9f940bc2 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.exception.service + +class IncompatibleTaskException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt new file mode 100644 index 00000000..49b47dbf --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.exception.service + +class QueueCannotDequeueException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt new file mode 100644 index 00000000..dd6954b0 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.exception.service + +class RetryPolicyNotFoundException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt new file mode 100644 index 00000000..ca894165 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.exception.service + +class TaskNotRegisterException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt index 8e89722f..ff12278e 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.broker.service +import dev.usbharu.owl.broker.domain.exception.repository.RecordNotFoundException import dev.usbharu.owl.broker.domain.model.consumer.ConsumerRepository import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import kotlinx.coroutines.flow.Flow @@ -34,7 +35,8 @@ class AssignQueuedTaskDeciderImpl( ) : AssignQueuedTaskDecider { override fun findAssignableQueue(consumerId: UUID, numberOfConcurrent: Int): Flow { return flow { - val consumer = consumerRepository.findById(consumerId) ?: TODO() + val consumer = consumerRepository.findById(consumerId) + ?: throw RecordNotFoundException("Consumer not found. id: $consumerId") emitAll( queueStore.findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( consumer.tasks, diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt index 40dde20f..a8093829 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.broker.service +import dev.usbharu.owl.broker.domain.exception.service.QueueCannotDequeueException import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect @@ -65,8 +66,9 @@ class QueuedTaskAssignerImpl( queuedTask.assignedConsumer ) assignedTaskQueue - } catch (e: Exception) { - TODO("Not yet implemented") + } catch (e: QueueCannotDequeueException) { + logger.debug("Failed dequeue queue", e) + return null } } diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt index c3b8c465..32436a14 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.broker.service +import dev.usbharu.owl.broker.domain.exception.service.IncompatibleTaskException import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository import org.koin.core.annotation.Singleton @@ -30,6 +31,14 @@ interface RegisterTaskService { @Singleton class RegisterTaskServiceImpl(private val taskDefinitionRepository: TaskDefinitionRepository) : RegisterTaskService { override suspend fun registerTask(taskDefinition: TaskDefinition) { + val definedTask = taskDefinitionRepository.findByName(taskDefinition.name) + if (definedTask != null) { + logger.debug("Task already defined. name: ${taskDefinition.name}") + if (taskDefinition.propertyDefinitionHash != definedTask.propertyDefinitionHash) { + throw IncompatibleTaskException("Task ${taskDefinition.name} has already been defined, and the parameters are incompatible.") + } + return + } taskDefinitionRepository.save(taskDefinition) logger.info("Register a new task. name: {}",taskDefinition.name) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt index 3b4d8519..58df5d64 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt @@ -16,15 +16,25 @@ package dev.usbharu.owl.broker.service -import dev.usbharu.owl.common.retry.ExponentialRetryPolicy +import dev.usbharu.owl.broker.domain.exception.service.RetryPolicyNotFoundException import dev.usbharu.owl.common.retry.RetryPolicy +import org.slf4j.LoggerFactory interface RetryPolicyFactory { fun factory(name: String): RetryPolicy } -class DefaultRetryPolicyFactory(private val map: Map) : RetryPolicyFactory { +class DefaultRetryPolicyFactory(private val map: Map) : RetryPolicyFactory { override fun factory(name: String): RetryPolicy { - return map[name]?: ExponentialRetryPolicy() + return map[name] ?: throwException(name) + } + + private fun throwException(name: String): Nothing { + logger.warn("RetryPolicy not found. name: {}", name) + throw RetryPolicyNotFoundException("RetryPolicy not found. name: $name") + } + + companion object { + private val logger = LoggerFactory.getLogger(RetryPolicyFactory::class.java) } } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index d5751249..6b3af780 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.broker.service +import dev.usbharu.owl.broker.domain.exception.service.TaskNotRegisterException import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.broker.domain.model.task.TaskRepository @@ -46,13 +47,13 @@ class TaskManagementServiceImpl( private val taskRepository: TaskRepository ) : TaskManagementService { - private var flow:Flow = flowOf() + private var flow: Flow = flowOf() override suspend fun startManagement() { flow = taskScanner.startScan() - flow.onEach { - enqueueTask(it) - }.collect() + flow.onEach { + enqueueTask(it) + }.collect() } @@ -61,7 +62,7 @@ class TaskManagementServiceImpl( return assignQueuedTaskDecider.findAssignableQueue(consumerId, numberOfConcurrent) } - private suspend fun enqueueTask(task: Task):QueuedTask{ + private suspend fun enqueueTask(task: Task): QueuedTask { val queuedTask = QueuedTask( task.attempt + 1, @@ -71,19 +72,21 @@ class TaskManagementServiceImpl( null ) + val definedTask = taskDefinitionRepository.findByName(task.name) + ?: throw TaskNotRegisterException("Task ${task.name} not definition.") val copy = task.copy( - nextRetry = retryPolicyFactory.factory(taskDefinitionRepository.findByName(task.name)?.retryPolicy.orEmpty()) + nextRetry = retryPolicyFactory.factory(definedTask.retryPolicy) .nextRetry(Instant.now(), task.attempt) ) taskRepository.save(copy) queueStore.enqueue(queuedTask) - logger.debug("Enqueue Task. {} {}", task.name, task.id) + logger.debug("Enqueue Task. name: {} id: {} attempt: {}", task.name, task.id, queuedTask.attempt) return queuedTask } - companion object{ + companion object { private val logger = LoggerFactory.getLogger(TaskManagementServiceImpl::class.java) } } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt index 288bc16b..a1812c3b 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.broker.service +import dev.usbharu.owl.broker.domain.exception.service.TaskNotRegisterException import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.broker.domain.model.task.TaskRepository import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository @@ -49,7 +50,8 @@ class TaskPublishServiceImpl( override suspend fun publishTask(publishTask: PublishTask): PublishedTask { val id = UUID.randomUUID() - val definition = taskDefinitionRepository.findByName(publishTask.name) ?: TODO() + val definition = taskDefinitionRepository.findByName(publishTask.name) + ?: throw TaskNotRegisterException("Task ${publishTask.name} not definition.") val published = Instant.now() val nextRetry = retryPolicyFactory.factory(definition.name).nextRetry(published,0) From 653f47d5dc599304861ffee6efe3ead85ebfd867 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 6 Mar 2024 15:11:10 +0900 Subject: [PATCH 11/36] =?UTF-8?q?feat:=20=E8=B5=B7=E5=8B=95=E6=99=82?= =?UTF-8?q?=E3=81=AB=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=93=E3=81=A0=E3=83=A2?= =?UTF-8?q?=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB=E3=81=AE=E5=90=8D=E5=89=8D?= =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt index 83cbaacd..092ffc62 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -22,10 +22,18 @@ import kotlinx.coroutines.runBlocking import org.koin.core.context.startKoin import org.koin.dsl.module import org.koin.ksp.generated.defaultModule +import org.slf4j.LoggerFactory import java.util.* +val logger = LoggerFactory.getLogger("MAIN") + fun main() { - val moduleContext = ServiceLoader.load(ModuleContext::class.java).first() + val moduleContexts = ServiceLoader.load(ModuleContext::class.java) + + val moduleContext = moduleContexts.first() + + logger.info("Use module name: {}", moduleContext) + val koin = startKoin { printLogger() From ea5605853eb0fe657fa8bbac94bebf5b06a759f6 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 6 Mar 2024 17:44:18 +0900 Subject: [PATCH 12/36] =?UTF-8?q?feat:=20=E3=82=AD=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6=E3=83=88?= =?UTF-8?q?=E3=82=92=E7=9B=A3=E8=A6=96=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mongodb/MongodbQueuedTaskRepository.kt | 60 +++++++++++++++++-- .../broker/mongodb/MongodbTaskRepository.kt | 5 ++ .../kotlin/dev/usbharu/owl/broker/Main.kt | 3 +- .../owl/broker/OwlBrokerApplication.kt | 2 +- .../model/queuedtask/QueuedTaskRepository.kt | 3 + .../owl/broker/service/QueueScanner.kt | 48 +++++++++++++++ .../usbharu/owl/broker/service/QueueStore.kt | 7 +++ .../broker/service/TaskManagementService.kt | 40 ++++++++++--- .../service/TaskManagementServiceImplTest.kt | 13 ---- 9 files changed, 152 insertions(+), 29 deletions(-) create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt delete mode 100644 broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt index c44cf96c..a32e1fd6 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.broker.mongodb +import com.mongodb.client.model.Filters import com.mongodb.client.model.Filters.* import com.mongodb.client.model.FindOneAndUpdateOptions import com.mongodb.client.model.ReplaceOptions @@ -24,6 +25,8 @@ import com.mongodb.client.model.Updates.set import com.mongodb.kotlin.client.coroutine.MongoDatabase import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTaskRepository +import dev.usbharu.owl.broker.domain.model.task.Task +import dev.usbharu.owl.common.property.PropertySerializeUtils import dev.usbharu.owl.common.property.PropertySerializerFactory import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map @@ -35,12 +38,15 @@ import java.time.Instant import java.util.* @Singleton -class MongodbQueuedTaskRepository(private val propertySerializerFactory: PropertySerializerFactory,database: MongoDatabase) : QueuedTaskRepository { +class MongodbQueuedTaskRepository( + private val propertySerializerFactory: PropertySerializerFactory, + database: MongoDatabase +) : QueuedTaskRepository { private val collection = database.getCollection("queued_task") override suspend fun save(queuedTask: QueuedTask): QueuedTask { collection.replaceOne( - eq("_id", queuedTask.task.id.toString()), QueuedTaskMongodb.of(propertySerializerFactory,queuedTask), + eq("_id", queuedTask.task.id.toString()), QueuedTaskMongodb.of(propertySerializerFactory, queuedTask), ReplaceOptions().upsert(true) ) return queuedTask @@ -75,6 +81,11 @@ class MongodbQueuedTaskRepository(private val propertySerializerFactory: Propert ) ).map { it.toQueuedTask(propertySerializerFactory) } } + + override fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow { + return collection.find(Filters.lte(QueuedTaskMongodb::queuedAt.name, instant)) + .map { it.toQueuedTask(propertySerializerFactory) } + } } data class QueuedTaskMongodb( @@ -93,16 +104,55 @@ data class QueuedTaskMongodb( attempt, queuedAt, task.toTask(propertySerializerFactory), - UUID.fromString(assignedConsumer), + assignedConsumer?.let { UUID.fromString(it) }, assignedAt ) } + data class TaskMongodb( + val name: String, + val id: String, + val publishProducerId: String, + val publishedAt: Instant, + val nextRetry: Instant, + val completedAt: Instant?, + val attempt: Int, + val properties: Map + ) { + + fun toTask(propertySerializerFactory: PropertySerializerFactory): Task { + return Task( + name = name, + id = UUID.fromString(id), + publishProducerId = UUID.fromString(publishProducerId), + publishedAt = publishedAt, + nextRetry = nextRetry, + completedAt = completedAt, + attempt = attempt, + properties = PropertySerializeUtils.deserialize(propertySerializerFactory, properties) + ) + } + + companion object { + fun of(propertySerializerFactory: PropertySerializerFactory, task: Task): TaskMongodb { + return TaskMongodb( + task.name, + task.id.toString(), + task.publishProducerId.toString(), + task.publishedAt, + task.nextRetry, + task.completedAt, + task.attempt, + PropertySerializeUtils.serialize(propertySerializerFactory, task.properties) + ) + } + } + } companion object { - fun of(propertySerializerFactory: PropertySerializerFactory,queuedTask: QueuedTask): QueuedTaskMongodb { + fun of(propertySerializerFactory: PropertySerializerFactory, queuedTask: QueuedTask): QueuedTaskMongodb { return QueuedTaskMongodb( queuedTask.task.id.toString(), - TaskMongodb.of(propertySerializerFactory,queuedTask.task), + TaskMongodb.of(propertySerializerFactory, queuedTask.task), queuedTask.attempt, queuedTask.queuedAt, queuedTask.assignedConsumer?.toString(), diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt index 9dd5b4e5..6fe26dde 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt @@ -25,6 +25,9 @@ import dev.usbharu.owl.common.property.PropertySerializeUtils import dev.usbharu.owl.common.property.PropertySerializerFactory import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import org.bson.BsonType +import org.bson.codecs.pojo.annotations.BsonId +import org.bson.codecs.pojo.annotations.BsonRepresentation import org.koin.core.annotation.Singleton import java.time.Instant import java.util.* @@ -50,6 +53,8 @@ class MongodbTaskRepository(database: MongoDatabase, private val propertySeriali data class TaskMongodb( val name: String, + @BsonId + @BsonRepresentation(BsonType.STRING) val id: String, val publishProducerId: String, val publishedAt: Instant, diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt index 092ffc62..2dd9e400 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -18,6 +18,7 @@ package dev.usbharu.owl.broker import dev.usbharu.owl.broker.service.DefaultRetryPolicyFactory import dev.usbharu.owl.broker.service.RetryPolicyFactory +import dev.usbharu.owl.common.retry.ExponentialRetryPolicy import kotlinx.coroutines.runBlocking import org.koin.core.context.startKoin import org.koin.dsl.module @@ -40,7 +41,7 @@ fun main() { val module = module { single { - DefaultRetryPolicyFactory(emptyMap()) + DefaultRetryPolicyFactory(mapOf("" to ExponentialRetryPolicy())) } } modules(module, defaultModule, moduleContext.module()) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt index a6cc6176..92c203a1 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt @@ -55,7 +55,7 @@ class OwlBrokerApplication( ) return coroutineScope.launch { - taskManagementService.startManagement() + taskManagementService.startManagement(this) } } diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt index 049b92ac..3de8800c 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt @@ -17,6 +17,7 @@ package dev.usbharu.owl.broker.domain.model.queuedtask import kotlinx.coroutines.flow.Flow +import java.time.Instant import java.util.* interface QueuedTaskRepository { @@ -28,4 +29,6 @@ interface QueuedTaskRepository { suspend fun findByTaskIdAndAssignedConsumerIsNullAndUpdate(id:UUID,update:QueuedTask):QueuedTask fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks:List,limit:Int): Flow + + fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt new file mode 100644 index 00000000..3a1669eb --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask +import kotlinx.coroutines.currentCoroutineContext +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.emitAll +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.isActive +import org.koin.core.annotation.Singleton +import java.time.Instant + +interface QueueScanner { + fun startScan(): Flow +} + +@Singleton +class QueueScannerImpl(private val queueStore: QueueStore) : QueueScanner { + override fun startScan(): Flow { + return flow { + while (currentCoroutineContext().isActive) { + emitAll(scanQueue()) + delay(1000) + } + } + } + + private fun scanQueue(): Flow { + return queueStore.findByQueuedAtBeforeAndAssignedConsumerIsNull(Instant.now().minusSeconds(10)) + } + +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt index bb49f6b8..9fe6b1e2 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt @@ -20,6 +20,7 @@ import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTaskRepository import kotlinx.coroutines.flow.Flow import org.koin.core.annotation.Singleton +import java.time.Instant interface QueueStore { suspend fun enqueue(queuedTask: QueuedTask) @@ -28,6 +29,8 @@ interface QueueStore { suspend fun dequeue(queuedTask: QueuedTask) suspend fun dequeueAll(queuedTaskList: List) fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks: List, limit: Int): Flow + + fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow } @Singleton @@ -55,4 +58,8 @@ class QueueStoreImpl(private val queuedTaskRepository: QueuedTaskRepository) : Q return queuedTaskRepository.findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks, limit) } + override fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow { + return queuedTaskRepository.findByQueuedAtBeforeAndAssignedConsumerIsNull(instant) + } + } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index 6b3af780..1bbaae7f 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -21,10 +21,14 @@ import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.broker.domain.model.task.TaskRepository import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.joinAll +import kotlinx.coroutines.launch import org.koin.core.annotation.Singleton import org.slf4j.LoggerFactory import java.time.Instant @@ -33,7 +37,7 @@ import java.util.* interface TaskManagementService { - suspend fun startManagement() + suspend fun startManagement(coroutineScope: CoroutineScope) fun findAssignableTask(consumerId: UUID, numberOfConcurrent: Int): Flow } @@ -44,17 +48,35 @@ class TaskManagementServiceImpl( private val taskDefinitionRepository: TaskDefinitionRepository, private val assignQueuedTaskDecider: AssignQueuedTaskDecider, private val retryPolicyFactory: RetryPolicyFactory, - private val taskRepository: TaskRepository + private val taskRepository: TaskRepository, + private val queueScanner: QueueScanner ) : TaskManagementService { - private var flow: Flow = flowOf() - override suspend fun startManagement() { - flow = taskScanner.startScan() - - flow.onEach { - enqueueTask(it) - }.collect() + private var taskFlow: Flow = flowOf() + private var queueFlow: Flow = flowOf() + override suspend fun startManagement(coroutineScope: CoroutineScope) { + taskFlow = taskScanner.startScan() + queueFlow = queueScanner.startScan() + coroutineScope { + listOf( + launch { + taskFlow.onEach { + enqueueTask(it) + }.collect() + }, + launch { + queueFlow.onEach { + logger.warn( + "Queue timed out. name: {} id: {} attempt: {}", + it.task.name, + it.task.id, + it.attempt + ) + }.collect() + } + ).joinAll() + } } diff --git a/broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt b/broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt deleted file mode 100644 index 6d968be7..00000000 --- a/broker/src/test/kotlin/dev/usbharu/owl/broker/service/TaskManagementServiceImplTest.kt +++ /dev/null @@ -1,13 +0,0 @@ -package dev.usbharu.owl.broker.service - -import org.junit.jupiter.api.Test - -class TaskManagementServiceImplTest { - - @Test - fun findAssignableTask() { - val taskManagementServiceImpl = TaskManagementServiceImpl() - - Thread.sleep(10000) - } -} \ No newline at end of file From abb609c60b2256fdc91ec7bc074de3879baf0da6 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 6 Mar 2024 18:27:28 +0900 Subject: [PATCH 13/36] =?UTF-8?q?feat:=20MongoDB=E3=81=B8=E3=81=AE?= =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=82=92IO=E3=82=B9?= =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=89=E3=81=A7=E8=A1=8C=E3=81=86=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mongodb/MongodbConsumerRepository.kt | 10 ++-- .../mongodb/MongodbProducerRepository.kt | 6 ++- .../mongodb/MongodbQueuedTaskRepository.kt | 51 +++++++++++-------- .../MongodbTaskDefinitionRepository.kt | 12 +++-- .../broker/mongodb/MongodbTaskRepository.kt | 9 ++-- 5 files changed, 52 insertions(+), 36 deletions(-) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt index 1c348921..43207580 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt @@ -21,7 +21,9 @@ import com.mongodb.client.model.ReplaceOptions import com.mongodb.kotlin.client.coroutine.MongoDatabase import dev.usbharu.owl.broker.domain.model.consumer.Consumer import dev.usbharu.owl.broker.domain.model.consumer.ConsumerRepository +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.singleOrNull +import kotlinx.coroutines.withContext import org.bson.BsonType import org.bson.codecs.pojo.annotations.BsonId import org.bson.codecs.pojo.annotations.BsonRepresentation @@ -32,13 +34,13 @@ import java.util.* class MongodbConsumerRepository(database: MongoDatabase) : ConsumerRepository { private val collection = database.getCollection("consumers") - override suspend fun save(consumer: Consumer): Consumer { + override suspend fun save(consumer: Consumer): Consumer = withContext(Dispatchers.IO) { collection.replaceOne(Filters.eq("_id", consumer.id.toString()), ConsumerMongodb.of(consumer), ReplaceOptions().upsert(true)) - return consumer + return@withContext consumer } - override suspend fun findById(id: UUID): Consumer? { - return collection.find(Filters.eq("_id", id.toString())).singleOrNull()?.toConsumer() + override suspend fun findById(id: UUID): Consumer? = withContext(Dispatchers.IO) { + return@withContext collection.find(Filters.eq("_id", id.toString())).singleOrNull()?.toConsumer() } } diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt index fe93cf88..3593e5f8 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt @@ -21,6 +21,8 @@ import com.mongodb.client.model.ReplaceOptions import com.mongodb.kotlin.client.coroutine.MongoDatabase import dev.usbharu.owl.broker.domain.model.producer.Producer import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext import org.koin.core.annotation.Singleton import java.time.Instant import java.util.* @@ -30,13 +32,13 @@ class MongodbProducerRepository(database: MongoDatabase) : ProducerRepository { private val collection = database.getCollection("producers") - override suspend fun save(producer: Producer): Producer { + override suspend fun save(producer: Producer): Producer = withContext(Dispatchers.IO) { collection.replaceOne( Filters.eq("_id", producer.id.toString()), ProducerMongodb.of(producer), ReplaceOptions().upsert(true) ) - return producer + return@withContext producer } } diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt index a32e1fd6..34201994 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt @@ -16,7 +16,6 @@ package dev.usbharu.owl.broker.mongodb -import com.mongodb.client.model.Filters import com.mongodb.client.model.Filters.* import com.mongodb.client.model.FindOneAndUpdateOptions import com.mongodb.client.model.ReplaceOptions @@ -28,8 +27,11 @@ import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTaskRepository import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.common.property.PropertySerializeUtils import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map +import kotlinx.coroutines.withContext import org.bson.BsonType import org.bson.codecs.pojo.annotations.BsonId import org.bson.codecs.pojo.annotations.BsonRepresentation @@ -45,29 +47,34 @@ class MongodbQueuedTaskRepository( private val collection = database.getCollection("queued_task") override suspend fun save(queuedTask: QueuedTask): QueuedTask { - collection.replaceOne( - eq("_id", queuedTask.task.id.toString()), QueuedTaskMongodb.of(propertySerializerFactory, queuedTask), - ReplaceOptions().upsert(true) - ) + withContext(Dispatchers.IO) { + collection.replaceOne( + eq("_id", queuedTask.task.id.toString()), QueuedTaskMongodb.of(propertySerializerFactory, queuedTask), + ReplaceOptions().upsert(true) + ) + } return queuedTask } override suspend fun findByTaskIdAndAssignedConsumerIsNullAndUpdate(id: UUID, update: QueuedTask): QueuedTask { - val findOneAndUpdate = collection.findOneAndUpdate( - and( - eq("_id", id.toString()), - eq(QueuedTaskMongodb::assignedConsumer.name, null) - ), - listOf( - set(QueuedTaskMongodb::assignedConsumer.name, update.assignedConsumer), - set(QueuedTaskMongodb::assignedAt.name, update.assignedAt) - ), - FindOneAndUpdateOptions().upsert(false).returnDocument(ReturnDocument.AFTER) - ) - if (findOneAndUpdate == null) { - TODO() + return withContext(Dispatchers.IO) { + + val findOneAndUpdate = collection.findOneAndUpdate( + and( + eq("_id", id.toString()), + eq(QueuedTaskMongodb::assignedConsumer.name, null) + ), + listOf( + set(QueuedTaskMongodb::assignedConsumer.name, update.assignedConsumer), + set(QueuedTaskMongodb::assignedAt.name, update.assignedAt) + ), + FindOneAndUpdateOptions().upsert(false).returnDocument(ReturnDocument.AFTER) + ) + if (findOneAndUpdate == null) { + TODO() + } + findOneAndUpdate.toQueuedTask(propertySerializerFactory) } - return findOneAndUpdate.toQueuedTask(propertySerializerFactory) } override fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( @@ -79,12 +86,12 @@ class MongodbQueuedTaskRepository( `in`("task.name", tasks), eq(QueuedTaskMongodb::assignedConsumer.name, null) ) - ).map { it.toQueuedTask(propertySerializerFactory) } + ).map { it.toQueuedTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } override fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow { - return collection.find(Filters.lte(QueuedTaskMongodb::queuedAt.name, instant)) - .map { it.toQueuedTask(propertySerializerFactory) } + return collection.find(lte(QueuedTaskMongodb::queuedAt.name, instant)) + .map { it.toQueuedTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } } diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt index a186cd52..ced2b19a 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt @@ -21,7 +21,9 @@ import com.mongodb.client.model.ReplaceOptions import com.mongodb.kotlin.client.coroutine.MongoDatabase import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.singleOrNull +import kotlinx.coroutines.withContext import org.bson.BsonType import org.bson.codecs.pojo.annotations.BsonId import org.bson.codecs.pojo.annotations.BsonRepresentation @@ -31,21 +33,21 @@ import org.koin.core.annotation.Singleton class MongodbTaskDefinitionRepository(database: MongoDatabase) : TaskDefinitionRepository { private val collection = database.getCollection("task_definition") - override suspend fun save(taskDefinition: TaskDefinition): TaskDefinition { + override suspend fun save(taskDefinition: TaskDefinition): TaskDefinition = withContext(Dispatchers.IO) { collection.replaceOne( Filters.eq("_id", taskDefinition.name), TaskDefinitionMongodb.of(taskDefinition), ReplaceOptions().upsert(true) ) - return taskDefinition + return@withContext taskDefinition } - override suspend fun deleteByName(name: String) { + override suspend fun deleteByName(name: String): Unit = withContext(Dispatchers.IO) { collection.deleteOne(Filters.eq("_id",name)) } - override suspend fun findByName(name: String): TaskDefinition? { - return collection.find(Filters.eq("_id", name)).singleOrNull()?.toTaskDefinition() + override suspend fun findByName(name: String): TaskDefinition? = withContext(Dispatchers.IO) { + return@withContext collection.find(Filters.eq("_id", name)).singleOrNull()?.toTaskDefinition() } } diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt index 6fe26dde..1403ab5a 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt @@ -23,8 +23,11 @@ import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.broker.domain.model.task.TaskRepository import dev.usbharu.owl.common.property.PropertySerializeUtils import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map +import kotlinx.coroutines.withContext import org.bson.BsonType import org.bson.codecs.pojo.annotations.BsonId import org.bson.codecs.pojo.annotations.BsonRepresentation @@ -37,17 +40,17 @@ class MongodbTaskRepository(database: MongoDatabase, private val propertySeriali TaskRepository { private val collection = database.getCollection("tasks") - override suspend fun save(task: Task): Task { + override suspend fun save(task: Task): Task = withContext(Dispatchers.IO) { collection.replaceOne( Filters.eq("_id", task.id.toString()), TaskMongodb.of(propertySerializerFactory, task), ReplaceOptions().upsert(true) ) - return task + return@withContext task } override fun findByNextRetryBefore(timestamp: Instant): Flow { return collection.find(Filters.lte(TaskMongodb::nextRetry.name, timestamp)) - .map { it.toTask(propertySerializerFactory) } + .map { it.toTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } } From 5bcf24f7a32eda68f9070ecbdd5129f6bdff8301 Mon Sep 17 00:00:00 2001 From: usbharu Date: Wed, 6 Mar 2024 21:17:29 +0900 Subject: [PATCH 14/36] =?UTF-8?q?feat:=20=E3=82=AD=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=81=8C=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6=E3=83=88?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=82=89=E3=81=9D=E3=82=8C=E3=82=92=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mongodb/MongodbQueuedTaskRepository.kt | 26 +++++++++++---- .../broker/mongodb/MongodbTaskRepository.kt | 5 +++ .../domain/model/queuedtask/QueuedTask.kt | 5 ++- .../model/queuedtask/QueuedTaskRepository.kt | 4 +-- .../domain/model/task/TaskRepository.kt | 3 ++ .../interfaces/grpc/TaskPublishService.kt | 2 +- .../broker/service/AssignQueuedTaskDecider.kt | 2 +- .../owl/broker/service/QueueScanner.kt | 2 +- .../usbharu/owl/broker/service/QueueStore.kt | 12 +++---- .../owl/broker/service/QueuedTaskAssigner.kt | 26 +++++++++------ .../broker/service/TaskManagementService.kt | 32 +++++++++++++++---- .../owl/broker/service/TaskPublishService.kt | 2 +- .../common/retry/ExponentialRetryPolicy.kt | 2 +- .../retry/ExponentialRetryPolicyTest.kt | 4 +-- 14 files changed, 88 insertions(+), 39 deletions(-) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt index 34201994..3b6c5506 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt @@ -62,11 +62,13 @@ class MongodbQueuedTaskRepository( val findOneAndUpdate = collection.findOneAndUpdate( and( eq("_id", id.toString()), - eq(QueuedTaskMongodb::assignedConsumer.name, null) + eq(QueuedTaskMongodb::isActive.name, true) ), listOf( set(QueuedTaskMongodb::assignedConsumer.name, update.assignedConsumer), - set(QueuedTaskMongodb::assignedAt.name, update.assignedAt) + set(QueuedTaskMongodb::assignedAt.name, update.assignedAt), + set(QueuedTaskMongodb::queuedAt.name, update.queuedAt), + set(QueuedTaskMongodb::isActive.name, update.isActive) ), FindOneAndUpdateOptions().upsert(false).returnDocument(ReturnDocument.AFTER) ) @@ -77,20 +79,25 @@ class MongodbQueuedTaskRepository( } } - override fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( + override fun findByTaskNameInAndIsActiveIsTrueAndOrderByPriority( tasks: List, limit: Int ): Flow { return collection.find( and( `in`("task.name", tasks), - eq(QueuedTaskMongodb::assignedConsumer.name, null) + eq(QueuedTaskMongodb::isActive.name, true) ) ).map { it.toQueuedTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } - override fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow { - return collection.find(lte(QueuedTaskMongodb::queuedAt.name, instant)) + override fun findByQueuedAtBeforeAndIsActiveIsTrue(instant: Instant): Flow { + return collection.find( + and( + lte(QueuedTaskMongodb::queuedAt.name, instant), + eq(QueuedTaskMongodb::isActive.name, true) + ) + ) .map { it.toQueuedTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } } @@ -102,6 +109,8 @@ data class QueuedTaskMongodb( val task: TaskMongodb, val attempt: Int, val queuedAt: Instant, + val isActive: Boolean, + val timeoutAt: Instant?, val assignedConsumer: String?, val assignedAt: Instant? ) { @@ -111,6 +120,8 @@ data class QueuedTaskMongodb( attempt, queuedAt, task.toTask(propertySerializerFactory), + isActive, + timeoutAt, assignedConsumer?.let { UUID.fromString(it) }, assignedAt ) @@ -155,6 +166,7 @@ data class QueuedTaskMongodb( } } } + companion object { fun of(propertySerializerFactory: PropertySerializerFactory, queuedTask: QueuedTask): QueuedTaskMongodb { return QueuedTaskMongodb( @@ -162,6 +174,8 @@ data class QueuedTaskMongodb( TaskMongodb.of(propertySerializerFactory, queuedTask.task), queuedTask.attempt, queuedTask.queuedAt, + queuedTask.isActive, + queuedTask.timeoutAt, queuedTask.assignedConsumer?.toString(), queuedTask.assignedAt ) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt index 1403ab5a..6840c41a 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt @@ -27,6 +27,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.withContext import org.bson.BsonType import org.bson.codecs.pojo.annotations.BsonId @@ -52,6 +53,10 @@ class MongodbTaskRepository(database: MongoDatabase, private val propertySeriali return collection.find(Filters.lte(TaskMongodb::nextRetry.name, timestamp)) .map { it.toTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } + + override suspend fun findById(uuid: UUID): Task? = withContext(Dispatchers.IO) { + collection.find(Filters.eq(uuid.toString())).singleOrNull()?.toTask(propertySerializerFactory) + } } data class TaskMongodb( diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt index e2ed5f21..f8c04374 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt @@ -22,11 +22,14 @@ import java.util.* /** * @param attempt キューされた時点での試行回数より1多い + * @param isActive trueならアサイン可能 falseならアサイン済みかタイムアウト等で無効 */ data class QueuedTask( val attempt: Int, val queuedAt: Instant, val task: Task, + val isActive: Boolean, + val timeoutAt: Instant?, val assignedConsumer: UUID?, - val assignedAt:Instant? + val assignedAt: Instant? ) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt index 3de8800c..9f3c12a7 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt @@ -28,7 +28,7 @@ interface QueuedTaskRepository { */ suspend fun findByTaskIdAndAssignedConsumerIsNullAndUpdate(id:UUID,update:QueuedTask):QueuedTask - fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks:List,limit:Int): Flow + fun findByTaskNameInAndIsActiveIsTrueAndOrderByPriority(tasks: List, limit: Int): Flow - fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow + fun findByQueuedAtBeforeAndIsActiveIsTrue(instant: Instant): Flow } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt index 60159a24..18befd08 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt @@ -18,9 +18,12 @@ package dev.usbharu.owl.broker.domain.model.task import kotlinx.coroutines.flow.Flow import java.time.Instant +import java.util.* interface TaskRepository { suspend fun save(task: Task):Task fun findByNextRetryBefore(timestamp:Instant): Flow + + suspend fun findById(uuid: UUID): Task? } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt index 803c8934..6aac7f39 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt @@ -55,7 +55,7 @@ class TaskPublishService( ) ) PublishedTask.newBuilder().setName(publishedTask.name).setId(publishedTask.id.toUUID()).build() - }catch (e:Error){ + } catch (e: Throwable) { logger.warn("exception ",e) throw StatusException(Status.INTERNAL) } diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt index ff12278e..e8ff8b41 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt @@ -38,7 +38,7 @@ class AssignQueuedTaskDeciderImpl( val consumer = consumerRepository.findById(consumerId) ?: throw RecordNotFoundException("Consumer not found. id: $consumerId") emitAll( - queueStore.findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( + queueStore.findByTaskNameInAndIsActiveIsTrueAndOrderByPriority( consumer.tasks, numberOfConcurrent ).take(numberOfConcurrent) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt index 3a1669eb..5102571a 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt @@ -42,7 +42,7 @@ class QueueScannerImpl(private val queueStore: QueueStore) : QueueScanner { } private fun scanQueue(): Flow { - return queueStore.findByQueuedAtBeforeAndAssignedConsumerIsNull(Instant.now().minusSeconds(10)) + return queueStore.findByQueuedAtBeforeAndIsActiveIsTrue(Instant.now().minusSeconds(10)) } } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt index 9fe6b1e2..2630915a 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt @@ -28,9 +28,9 @@ interface QueueStore { suspend fun dequeue(queuedTask: QueuedTask) suspend fun dequeueAll(queuedTaskList: List) - fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks: List, limit: Int): Flow + fun findByTaskNameInAndIsActiveIsTrueAndOrderByPriority(tasks: List, limit: Int): Flow - fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow + fun findByQueuedAtBeforeAndIsActiveIsTrue(instant: Instant): Flow } @Singleton @@ -51,15 +51,15 @@ class QueueStoreImpl(private val queuedTaskRepository: QueuedTaskRepository) : Q return queuedTaskList.forEach { dequeue(it) } } - override fun findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority( + override fun findByTaskNameInAndIsActiveIsTrueAndOrderByPriority( tasks: List, limit: Int ): Flow { - return queuedTaskRepository.findByTaskNameInAndAssignedConsumerIsNullAndOrderByPriority(tasks, limit) + return queuedTaskRepository.findByTaskNameInAndIsActiveIsTrueAndOrderByPriority(tasks, limit) } - override fun findByQueuedAtBeforeAndAssignedConsumerIsNull(instant: Instant): Flow { - return queuedTaskRepository.findByQueuedAtBeforeAndAssignedConsumerIsNull(instant) + override fun findByQueuedAtBeforeAndIsActiveIsTrue(instant: Instant): Flow { + return queuedTaskRepository.findByQueuedAtBeforeAndIsActiveIsTrue(instant) } } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt index a8093829..da6c1390 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt @@ -28,33 +28,39 @@ import java.time.Instant import java.util.* interface QueuedTaskAssigner { - fun ready(consumerId: UUID,numberOfConcurrent:Int): Flow + fun ready(consumerId: UUID, numberOfConcurrent: Int): Flow } @Singleton class QueuedTaskAssignerImpl( private val taskManagementService: TaskManagementService, private val queueStore: QueueStore -) : QueuedTaskAssigner{ +) : QueuedTaskAssigner { override fun ready(consumerId: UUID, numberOfConcurrent: Int): Flow { return flow { taskManagementService.findAssignableTask(consumerId, numberOfConcurrent) .onEach { - val assignTask = assignTask(it, consumerId) + val assignTask = assignTask(it, consumerId) - if (assignTask != null) { - emit(assignTask) - } + if (assignTask != null) { + emit(assignTask) + } } .collect() } } - private suspend fun assignTask(queuedTask: QueuedTask,consumerId: UUID):QueuedTask?{ + private suspend fun assignTask(queuedTask: QueuedTask, consumerId: UUID): QueuedTask? { return try { - val assignedTaskQueue = queuedTask.copy(assignedConsumer = consumerId, assignedAt = Instant.now()) - logger.trace("Try assign task: {} id: {} consumer: {}",queuedTask.task.name,queuedTask.task.id,consumerId) + val assignedTaskQueue = + queuedTask.copy(assignedConsumer = consumerId, assignedAt = Instant.now(), isActive = false) + logger.trace( + "Try assign task: {} id: {} consumer: {}", + queuedTask.task.name, + queuedTask.task.id, + consumerId + ) queueStore.dequeue(assignedTaskQueue) @@ -72,7 +78,7 @@ class QueuedTaskAssignerImpl( } } - companion object{ + companion object { private val logger = LoggerFactory.getLogger(QueuedTaskAssignerImpl::class.java) } } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index 1bbaae7f..2cf574d4 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.broker.service +import dev.usbharu.owl.broker.domain.exception.repository.RecordNotFoundException import dev.usbharu.owl.broker.domain.exception.service.TaskNotRegisterException import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import dev.usbharu.owl.broker.domain.model.task.Task @@ -67,12 +68,7 @@ class TaskManagementServiceImpl( }, launch { queueFlow.onEach { - logger.warn( - "Queue timed out. name: {} id: {} attempt: {}", - it.task.name, - it.task.id, - it.attempt - ) + timeoutQueue(it) }.collect() } ).joinAll() @@ -90,6 +86,8 @@ class TaskManagementServiceImpl( task.attempt + 1, Instant.now(), task, + isActive = true, + timeoutAt = null, null, null ) @@ -98,7 +96,7 @@ class TaskManagementServiceImpl( ?: throw TaskNotRegisterException("Task ${task.name} not definition.") val copy = task.copy( nextRetry = retryPolicyFactory.factory(definedTask.retryPolicy) - .nextRetry(Instant.now(), task.attempt) + .nextRetry(Instant.now(), queuedTask.attempt) ) taskRepository.save(copy) @@ -108,6 +106,26 @@ class TaskManagementServiceImpl( return queuedTask } + private suspend fun timeoutQueue(queuedTask: QueuedTask) { + val timeoutQueue = queuedTask.copy(isActive = false, timeoutAt = Instant.now()) + + queueStore.dequeue(timeoutQueue) + + + val task = taskRepository.findById(timeoutQueue.task.id) + ?: throw RecordNotFoundException("Task not found. id: ${timeoutQueue.task.id}") + val copy = task.copy(attempt = timeoutQueue.attempt) + + logger.warn( + "Queue timed out. name: {} id: {} attempt: {}", + timeoutQueue.task.name, + timeoutQueue.task.id, + timeoutQueue.attempt + ) + taskRepository.save(copy) + } + + companion object { private val logger = LoggerFactory.getLogger(TaskManagementServiceImpl::class.java) } diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt index a1812c3b..5b24922c 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt @@ -54,7 +54,7 @@ class TaskPublishServiceImpl( ?: throw TaskNotRegisterException("Task ${publishTask.name} not definition.") val published = Instant.now() - val nextRetry = retryPolicyFactory.factory(definition.name).nextRetry(published,0) + val nextRetry = retryPolicyFactory.factory(definition.retryPolicy).nextRetry(published, 0) val task = Task( name = publishTask.name, diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt index 8745fc1f..753746db 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt @@ -6,6 +6,6 @@ import kotlin.math.roundToLong class ExponentialRetryPolicy(private val firstRetrySeconds: Int = 30) : RetryPolicy { override fun nextRetry(now: Instant, attempt: Int): Instant = - now.plusSeconds(firstRetrySeconds.times((2.0).pow(attempt).roundToLong())) + now.plusSeconds(firstRetrySeconds.times((2.0).pow(attempt).roundToLong()) - 30) } \ No newline at end of file diff --git a/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt b/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt index 53ea7a15..c1a1dc2e 100644 --- a/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt +++ b/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt @@ -25,12 +25,12 @@ class ExponentialRetryPolicyTest { fun exponential0() { val nextRetry = ExponentialRetryPolicy().nextRetry(Instant.ofEpochSecond(300), 0) - assertEquals(Instant.ofEpochSecond(330), nextRetry) + assertEquals(Instant.ofEpochSecond(300), nextRetry) } @Test fun exponential1() { val nextRetry = ExponentialRetryPolicy().nextRetry(Instant.ofEpochSecond(300), 1) - assertEquals(Instant.ofEpochSecond(360), nextRetry) + assertEquals(Instant.ofEpochSecond(330), nextRetry) } } \ No newline at end of file From fd3989b604d872e8a2d1dfce670b3ddcf38945a4 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Thu, 7 Mar 2024 12:15:07 +0900 Subject: [PATCH 15/36] =?UTF-8?q?feat:=20=E3=82=BF=E3=82=B9=E3=82=AF?= =?UTF-8?q?=E3=82=92=E3=81=BE=E3=81=A8=E3=82=81=E3=81=A6=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../broker/mongodb/MongodbTaskRepository.kt | 11 ++++++ .../domain/model/task/TaskRepository.kt | 2 ++ .../interfaces/grpc/TaskPublishService.kt | 25 ++++++++++--- .../owl/broker/service/TaskPublishService.kt | 36 +++++++++++++++++-- broker/src/main/proto/publish_task.proto | 17 +++++++++ 5 files changed, 84 insertions(+), 7 deletions(-) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt index 6840c41a..875c4209 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt @@ -17,6 +17,7 @@ package dev.usbharu.owl.broker.mongodb import com.mongodb.client.model.Filters +import com.mongodb.client.model.ReplaceOneModel import com.mongodb.client.model.ReplaceOptions import com.mongodb.kotlin.client.coroutine.MongoDatabase import dev.usbharu.owl.broker.domain.model.task.Task @@ -49,6 +50,16 @@ class MongodbTaskRepository(database: MongoDatabase, private val propertySeriali return@withContext task } + override suspend fun saveAll(tasks: List): Unit = withContext(Dispatchers.IO) { + collection.bulkWrite(tasks.map { + ReplaceOneModel( + Filters.eq(it.id.toString()), + TaskMongodb.of(propertySerializerFactory, it), + ReplaceOptions().upsert(true) + ) + }) + } + override fun findByNextRetryBefore(timestamp: Instant): Flow { return collection.find(Filters.lte(TaskMongodb::nextRetry.name, timestamp)) .map { it.toTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt index 18befd08..38e001bb 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt @@ -23,6 +23,8 @@ import java.util.* interface TaskRepository { suspend fun save(task: Task):Task + suspend fun saveAll(tasks:List) + fun findByNextRetryBefore(timestamp:Instant): Flow suspend fun findById(uuid: UUID): Task? diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt index 6aac7f39..e305cb41 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt @@ -18,6 +18,7 @@ package dev.usbharu.owl.broker.interfaces.grpc import dev.usbharu.owl.PublishTaskOuterClass import dev.usbharu.owl.PublishTaskOuterClass.PublishedTask +import dev.usbharu.owl.PublishTaskOuterClass.PublishedTasks import dev.usbharu.owl.TaskPublishServiceGrpcKt.TaskPublishServiceCoroutineImplBase import dev.usbharu.owl.broker.external.toUUID import dev.usbharu.owl.broker.service.PublishTask @@ -56,14 +57,28 @@ class TaskPublishService( ) PublishedTask.newBuilder().setName(publishedTask.name).setId(publishedTask.id.toUUID()).build() } catch (e: Throwable) { - logger.warn("exception ",e) + logger.warn("exception ", e) throw StatusException(Status.INTERNAL) } - - } - companion object{ - private val logger = LoggerFactory.getLogger(dev.usbharu.owl.broker.interfaces.grpc.TaskPublishService::class.java) + override suspend fun publishTasks(request: PublishTaskOuterClass.PublishTasks): PublishTaskOuterClass.PublishedTasks { + + val tasks = request.propertiesArrayList.map { + PublishTask( + request.name, + request.producerId.toUUID(), + PropertySerializeUtils.deserialize(propertySerializerFactory, it.propertiesMap) + ) + } + + val publishTasks = taskPublishService.publishTasks(tasks) + + return PublishedTasks.newBuilder().setName(request.name).addAllId(publishTasks.map { it.id.toUUID() }).build() + } + + companion object { + private val logger = + LoggerFactory.getLogger(dev.usbharu.owl.broker.interfaces.grpc.TaskPublishService::class.java) } } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt index 5b24922c..8446bf48 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt @@ -28,6 +28,7 @@ import java.util.* interface TaskPublishService { suspend fun publishTask(publishTask: PublishTask): PublishedTask + suspend fun publishTasks(list: List): List } data class PublishTask( @@ -44,11 +45,11 @@ data class PublishedTask( @Singleton class TaskPublishServiceImpl( private val taskRepository: TaskRepository, - private val taskDefinitionRepository:TaskDefinitionRepository, + private val taskDefinitionRepository: TaskDefinitionRepository, private val retryPolicyFactory: RetryPolicyFactory ) : TaskPublishService { override suspend fun publishTask(publishTask: PublishTask): PublishedTask { - val id = UUID.randomUUID() + val id = UUID.randomUUID() val definition = taskDefinitionRepository.findByName(publishTask.name) ?: throw TaskNotRegisterException("Task ${publishTask.name} not definition.") @@ -77,6 +78,37 @@ class TaskPublishServiceImpl( ) } + override suspend fun publishTasks(list: List): List { + + val first = list.first() + + val definition = taskDefinitionRepository.findByName(first.name) + ?: throw TaskNotRegisterException("Task ${first.name} not definition.") + + val published = Instant.now() + + val nextRetry = retryPolicyFactory.factory(definition.retryPolicy).nextRetry(published, 0) + + val tasks = list.map { + Task( + it.name, + UUID.randomUUID(), + first.producerId, + published, + nextRetry, + null, + 0, + it.properties + ) + } + + taskRepository.saveAll(tasks) + + logger.debug("Published {} tasks. name: {}", tasks.size, first.name) + + return tasks.map { PublishedTask(it.name, it.id) } + } + companion object { private val logger = LoggerFactory.getLogger(TaskPublishServiceImpl::class.java) } diff --git a/broker/src/main/proto/publish_task.proto b/broker/src/main/proto/publish_task.proto index 447a4bc4..9194077a 100644 --- a/broker/src/main/proto/publish_task.proto +++ b/broker/src/main/proto/publish_task.proto @@ -15,11 +15,28 @@ message PublishTask { UUID producer_id = 4; } +message Properties { + map properties = 1; +} + +message PublishTasks { + string name = 1; + google.protobuf.Timestamp publishedAt = 2; + repeated Properties propertiesArray = 3; + UUID producer_id = 4; +} + message PublishedTask { string name = 1; UUID id = 2; } +message PublishedTasks { + string name = 1; + repeated UUID id = 2; +} + service TaskPublishService { rpc publishTask (PublishTask) returns (PublishedTask); + rpc publishTasks(PublishTasks) returns (PublishedTasks); } From 18ee65e23740a5c665d3c053c7d205502d4d5f3e Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Thu, 7 Mar 2024 13:12:06 +0900 Subject: [PATCH 16/36] =?UTF-8?q?chore:=20=E3=83=AD=E3=82=B0=E3=82=92?= =?UTF-8?q?=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/src/main/resources/log4j2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broker/src/main/resources/log4j2.xml b/broker/src/main/resources/log4j2.xml index e202a6fa..31bfafec 100644 --- a/broker/src/main/resources/log4j2.xml +++ b/broker/src/main/resources/log4j2.xml @@ -18,7 +18,7 @@ - %d{yyyy/MM/dd HH:mm:ss.SSS} [%t] %-6p %c{10}#%M:%L | %m%n + %d{yyyy/MM/dd HH:mm:ss.SSS} [%t] %-6p %c{10} | %m%n From 159dd943ecf058ff7f4d7e000e1ed2e5a2b55b62 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Thu, 7 Mar 2024 16:29:26 +0900 Subject: [PATCH 17/36] =?UTF-8?q?feat:=20=E3=82=BF=E3=82=B9=E3=82=AF?= =?UTF-8?q?=E5=AE=8C=E4=BA=86=E6=99=82=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../broker/mongodb/MongodbTaskRepository.kt | 9 +++- .../domain/model/task/TaskRepository.kt | 4 +- .../domain/model/taskresult/TaskResult.kt | 28 ++++++++++ .../model/taskresult/TaskResultRepository.kt | 21 ++++++++ .../interfaces/grpc/TaskResultService.kt | 53 +++++++++++++++++++ .../broker/service/TaskManagementService.kt | 10 ++++ .../usbharu/owl/broker/service/TaskScanner.kt | 2 +- broker/src/main/proto/task_result.proto | 5 ++ 8 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt index 875c4209..836007cb 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt @@ -60,8 +60,13 @@ class MongodbTaskRepository(database: MongoDatabase, private val propertySeriali }) } - override fun findByNextRetryBefore(timestamp: Instant): Flow { - return collection.find(Filters.lte(TaskMongodb::nextRetry.name, timestamp)) + override fun findByNextRetryBeforeAndCompletedAtIsNull(timestamp: Instant): Flow { + return collection.find( + Filters.and( + Filters.lte(TaskMongodb::nextRetry.name, timestamp), + Filters.eq(TaskMongodb::completedAt.name, null) + ) + ) .map { it.toTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt index 38e001bb..474d41f1 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt @@ -25,7 +25,9 @@ interface TaskRepository { suspend fun saveAll(tasks:List) - fun findByNextRetryBefore(timestamp:Instant): Flow + fun findByNextRetryBeforeAndCompletedAtIsNull(timestamp:Instant): Flow suspend fun findById(uuid: UUID): Task? + + suspend fun findByIdAndUpdate(id:UUID,task: Task) } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt new file mode 100644 index 00000000..e727ced7 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.taskresult + +import dev.usbharu.owl.common.property.PropertyValue +import java.util.* + +data class TaskResult( + val id: UUID, + val success: Boolean, + val attempt: Int, + val result: Map>, + val message: String +) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt new file mode 100644 index 00000000..d58072a3 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.domain.model.taskresult + +interface TaskResultRepository { + suspend fun save(taskResult: TaskResult):TaskResult +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt new file mode 100644 index 00000000..d73ac890 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.interfaces.grpc + +import com.google.protobuf.Empty +import dev.usbharu.owl.TaskResultOuterClass +import dev.usbharu.owl.TaskResultServiceGrpcKt +import dev.usbharu.owl.broker.domain.model.taskresult.TaskResult +import dev.usbharu.owl.broker.external.toUUID +import dev.usbharu.owl.broker.service.TaskManagementService +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.onEach +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +class TaskResultService( + coroutineContext: CoroutineContext = EmptyCoroutineContext, + private val taskManagementService: TaskManagementService, + private val propertySerializerFactory: PropertySerializerFactory +) : + TaskResultServiceGrpcKt.TaskResultServiceCoroutineImplBase(coroutineContext) { + override suspend fun tasKResult(requests: Flow): Empty { + requests.onEach { + taskManagementService.queueProcessed( + TaskResult( + id = it.id.toUUID(), + success = it.success, + attempt = it.attempt, + result = PropertySerializeUtils.deserialize(propertySerializerFactory, it.resultMap), + message = it.message + ) + ) + }.collect() + return Empty.getDefaultInstance() + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index 2cf574d4..36abe9ce 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -22,6 +22,7 @@ import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.broker.domain.model.task.TaskRepository import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository +import dev.usbharu.owl.broker.domain.model.taskresult.TaskResult import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow @@ -40,6 +41,8 @@ interface TaskManagementService { suspend fun startManagement(coroutineScope: CoroutineScope) fun findAssignableTask(consumerId: UUID, numberOfConcurrent: Int): Flow + + suspend fun queueProcessed(taskResult: TaskResult) } @Singleton @@ -125,6 +128,13 @@ class TaskManagementServiceImpl( taskRepository.save(copy) } + override suspend fun queueProcessed(taskResult: TaskResult) { + val task = taskRepository.findById(taskResult.id) + ?: throw RecordNotFoundException("Task not found. id: ${taskResult.id}") + + taskRepository.findByIdAndUpdate(taskResult.id,task.copy(completedAt = Instant.now())) +//todo タスク完了後の処理を書く + } companion object { private val logger = LoggerFactory.getLogger(TaskManagementServiceImpl::class.java) diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt index ff579e5c..3204f409 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt @@ -45,7 +45,7 @@ class TaskScannerImpl(private val taskRepository: TaskRepository) : } private fun scanTask(): Flow { - return taskRepository.findByNextRetryBefore(Instant.now()) + return taskRepository.findByNextRetryBeforeAndCompletedAtIsNull(Instant.now()) } companion object { diff --git a/broker/src/main/proto/task_result.proto b/broker/src/main/proto/task_result.proto index 43a07aed..642f7425 100644 --- a/broker/src/main/proto/task_result.proto +++ b/broker/src/main/proto/task_result.proto @@ -10,4 +10,9 @@ message TaskResult { bool success = 2; int32 attempt = 3; map result = 4; + string message = 5; +} + +service TaskResultService{ + rpc tasKResult(stream TaskResult) returns (google.protobuf.Empty); } \ No newline at end of file From fbafee4e5e0ba3bce5ec598e8376889c6070e044 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 9 Mar 2024 13:36:16 +0900 Subject: [PATCH 18/36] =?UTF-8?q?feat:=20Producer=E3=81=AB=E3=82=BF?= =?UTF-8?q?=E3=82=B9=E3=82=AF=E5=AE=8C=E4=BA=86=E3=82=92=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E3=81=99=E3=82=8B=E6=96=B9=E6=B3=95=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../broker/mongodb/MongodbTaskRepository.kt | 13 +++ .../mongodb/MongodbTaskResultRepository.kt | 93 +++++++++++++++++++ .../owl/broker/OwlBrokerApplication.kt | 4 +- .../domain/model/task/TaskRepository.kt | 2 + .../domain/model/taskresult/TaskResult.kt | 1 + .../model/taskresult/TaskResultRepository.kt | 4 + .../interfaces/grpc/TaskResultService.kt | 4 +- .../grpc/TaskResultSubscribeService.kt | 62 +++++++++++++ .../broker/service/TaskManagementService.kt | 61 +++++++++--- .../usbharu/owl/broker/service/TaskResults.kt | 28 ++++++ .../src/main/proto/task_result_producer.proto | 15 +++ 11 files changed, 274 insertions(+), 13 deletions(-) create mode 100644 broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt create mode 100644 broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt create mode 100644 broker/src/main/proto/task_result_producer.proto diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt index 836007cb..2d7215ae 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt @@ -73,6 +73,19 @@ class MongodbTaskRepository(database: MongoDatabase, private val propertySeriali override suspend fun findById(uuid: UUID): Task? = withContext(Dispatchers.IO) { collection.find(Filters.eq(uuid.toString())).singleOrNull()?.toTask(propertySerializerFactory) } + + override suspend fun findByIdAndUpdate(id: UUID, task: Task) { + collection.replaceOne( + Filters.eq("_id", task.id.toString()), TaskMongodb.of(propertySerializerFactory, task), + ReplaceOptions().upsert(false) + ) + } + + override suspend fun findByPublishProducerIdAndCompletedAtIsNotNull(publishProducerId: UUID): Flow { + return collection + .find(Filters.eq(TaskMongodb::publishProducerId.name, publishProducerId.toString())) + .map { it.toTask(propertySerializerFactory) } + } } data class TaskMongodb( diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt new file mode 100644 index 00000000..ed000fe2 --- /dev/null +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.mongodb + +import com.mongodb.client.model.Filters +import com.mongodb.client.model.ReplaceOptions +import com.mongodb.kotlin.client.coroutine.MongoDatabase +import dev.usbharu.owl.broker.domain.model.taskresult.TaskResult +import dev.usbharu.owl.broker.domain.model.taskresult.TaskResultRepository +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.withContext +import org.bson.BsonType +import org.bson.codecs.pojo.annotations.BsonId +import org.bson.codecs.pojo.annotations.BsonRepresentation +import org.koin.core.annotation.Singleton +import java.util.* + +@Singleton +class MongodbTaskResultRepository( + database: MongoDatabase, + private val propertySerializerFactory: PropertySerializerFactory +) : TaskResultRepository { + + private val collection = database.getCollection("task_results") + override suspend fun save(taskResult: TaskResult): TaskResult = withContext(Dispatchers.IO) { + collection.replaceOne( + Filters.eq(taskResult.id.toString()), TaskResultMongodb.of(propertySerializerFactory, taskResult), + ReplaceOptions().upsert(true) + ) + return@withContext taskResult + } + + override fun findByTaskId(id: UUID): Flow { + return collection.find(Filters.eq(id.toString())).map { it.toTaskResult(propertySerializerFactory) }.flowOn(Dispatchers.IO) + } +} + +data class TaskResultMongodb( + @BsonId + @BsonRepresentation(BsonType.STRING) + val id: String, + val taskId: String, + val success: Boolean, + val attempt: Int, + val result: Map, + val message: String +) { + + fun toTaskResult(propertySerializerFactory: PropertySerializerFactory): TaskResult { + return TaskResult( + UUID.fromString(id), + UUID.fromString(taskId), + success, + attempt, + PropertySerializeUtils.deserialize(propertySerializerFactory, result), + message + ) + } + + companion object { + fun of(propertySerializerFactory: PropertySerializerFactory, taskResult: TaskResult): TaskResultMongodb { + return TaskResultMongodb( + taskResult.id.toString(), + taskResult.taskId.toString(), + taskResult.success, + taskResult.attempt, + PropertySerializeUtils.serialize(propertySerializerFactory, taskResult.result), + taskResult.message + ) + + } + + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt index 92c203a1..66696f23 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt @@ -33,7 +33,8 @@ class OwlBrokerApplication( private val producerService: ProducerService, private val subscribeTaskService: SubscribeTaskService, private val taskPublishService: TaskPublishService, - private val taskManagementService: TaskManagementService + private val taskManagementService: TaskManagementService, + private val taskResultSubscribeService: TaskResultSubscribeService ) { private lateinit var server: Server @@ -45,6 +46,7 @@ class OwlBrokerApplication( .addService(producerService) .addService(subscribeTaskService) .addService(taskPublishService) + .addService(taskResultSubscribeService) .build() server.start() diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt index 474d41f1..009dea2d 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt @@ -30,4 +30,6 @@ interface TaskRepository { suspend fun findById(uuid: UUID): Task? suspend fun findByIdAndUpdate(id:UUID,task: Task) + + suspend fun findByPublishProducerIdAndCompletedAtIsNotNull(publishProducerId:UUID):Flow } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt index e727ced7..b024d04c 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt @@ -21,6 +21,7 @@ import java.util.* data class TaskResult( val id: UUID, + val taskId:UUID, val success: Boolean, val attempt: Int, val result: Map>, diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt index d58072a3..4118cfed 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt @@ -16,6 +16,10 @@ package dev.usbharu.owl.broker.domain.model.taskresult +import kotlinx.coroutines.flow.Flow +import java.util.* + interface TaskResultRepository { suspend fun save(taskResult: TaskResult):TaskResult + fun findByTaskId(id:UUID): Flow } \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt index d73ac890..613480b9 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt @@ -27,6 +27,7 @@ import dev.usbharu.owl.common.property.PropertySerializerFactory import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.onEach +import java.util.* import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext @@ -40,7 +41,8 @@ class TaskResultService( requests.onEach { taskManagementService.queueProcessed( TaskResult( - id = it.id.toUUID(), + id = UUID.randomUUID(), + taskId = it.id.toUUID(), success = it.success, attempt = it.attempt, result = PropertySerializeUtils.deserialize(propertySerializerFactory, it.resultMap), diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt new file mode 100644 index 00000000..9b930810 --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.interfaces.grpc + +import TaskResultProducer.TaskResults +import TaskResultSubscribeServiceGrpcKt +import dev.usbharu.owl.Uuid +import dev.usbharu.owl.broker.external.toUUID +import dev.usbharu.owl.broker.service.TaskManagementService +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.property.PropertySerializerFactory +import dev.usbharu.owl.taskResult +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import org.koin.core.annotation.Singleton +import taskResults +import kotlin.coroutines.CoroutineContext +import kotlin.coroutines.EmptyCoroutineContext + +@Singleton +class TaskResultSubscribeService( + private val taskManagementService: TaskManagementService, + private val propertySerializerFactory: PropertySerializerFactory, + coroutineContext: CoroutineContext = EmptyCoroutineContext +) : + TaskResultSubscribeServiceGrpcKt.TaskResultSubscribeServiceCoroutineImplBase(coroutineContext) { + override fun subscribe(request: Uuid.UUID): Flow { + return taskManagementService + .subscribeResult(request.toUUID()) + .map { + taskResults { + id = it.id.toUUID() + name = it.name + attempt = it.attempt + success = it.success + results.addAll(it.results.map { + taskResult { + id = it.taskId.toUUID() + success = it.success + attempt = it.attempt + result.putAll(PropertySerializeUtils.serialize(propertySerializerFactory, it.result)) + message = it.message + } + }) + } + } + } +} \ No newline at end of file diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index 36abe9ce..4cd78e55 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -23,14 +23,9 @@ import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.broker.domain.model.task.TaskRepository import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository import dev.usbharu.owl.broker.domain.model.taskresult.TaskResult -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.joinAll -import kotlinx.coroutines.launch +import dev.usbharu.owl.broker.domain.model.taskresult.TaskResultRepository +import kotlinx.coroutines.* +import kotlinx.coroutines.flow.* import org.koin.core.annotation.Singleton import org.slf4j.LoggerFactory import java.time.Instant @@ -43,6 +38,8 @@ interface TaskManagementService { fun findAssignableTask(consumerId: UUID, numberOfConcurrent: Int): Flow suspend fun queueProcessed(taskResult: TaskResult) + + fun subscribeResult(producerId: UUID): Flow } @Singleton @@ -53,7 +50,8 @@ class TaskManagementServiceImpl( private val assignQueuedTaskDecider: AssignQueuedTaskDecider, private val retryPolicyFactory: RetryPolicyFactory, private val taskRepository: TaskRepository, - private val queueScanner: QueueScanner + private val queueScanner: QueueScanner, + private val taskResultRepository: TaskResultRepository ) : TaskManagementService { private var taskFlow: Flow = flowOf() @@ -132,8 +130,49 @@ class TaskManagementServiceImpl( val task = taskRepository.findById(taskResult.id) ?: throw RecordNotFoundException("Task not found. id: ${taskResult.id}") - taskRepository.findByIdAndUpdate(taskResult.id,task.copy(completedAt = Instant.now())) -//todo タスク完了後の処理を書く + val taskDefinition = taskDefinitionRepository.findByName(task.name) + ?: throw TaskNotRegisterException("Task ${task.name} not definition.") + + val completedAt = if (taskResult.success) { + Instant.now() + } else if (taskResult.attempt >= taskDefinition.maxRetry) { + Instant.now() + } else { + null + } + + taskResultRepository.save(taskResult) + + taskRepository.findByIdAndUpdate( + taskResult.id, + task.copy(completedAt = completedAt, attempt = taskResult.attempt) + ) + + } + + override fun subscribeResult(producerId: UUID): Flow { + return flow { + + while (currentCoroutineContext().isActive) { + taskRepository + .findByPublishProducerIdAndCompletedAtIsNotNull(producerId) + .onEach { + val results = taskResultRepository.findByTaskId(it.id).toList() + emit( + TaskResults( + it.name, + it.id, + results.any { it.success }, + it.attempt, + results + ) + ) + } + delay(500) + } + + } + } companion object { diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt new file mode 100644 index 00000000..a61dbb0c --- /dev/null +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.broker.service + +import dev.usbharu.owl.broker.domain.model.taskresult.TaskResult +import java.util.* + +data class TaskResults( + val name:String, + val id:UUID, + val success:Boolean, + val attempt:Int, + val results: List +) diff --git a/broker/src/main/proto/task_result_producer.proto b/broker/src/main/proto/task_result_producer.proto new file mode 100644 index 00000000..8ab59a06 --- /dev/null +++ b/broker/src/main/proto/task_result_producer.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +import "uuid.proto"; +import "task_result.proto"; + +message TaskResults { + string name = 1; + UUID id = 2; + bool success = 3; + int32 attempt = 4; + repeated TaskResult results = 5; +} + +service TaskResultSubscribeService { + rpc subscribe(UUID) returns (stream TaskResults); +} \ No newline at end of file From cbfcc21dee78a86b0f988c54c7c0ae92d40cf571 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:35:02 +0900 Subject: [PATCH 19/36] =?UTF-8?q?feat:=20priority=E3=82=92=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../owl/broker/mongodb/MongoModuleContext.kt | 2 +- .../mongodb/MongodbQueuedTaskRepository.kt | 17 ++++++++------ .../domain/model/queuedtask/QueuedTask.kt | 1 + .../grpc/TaskResultSubscribeService.kt | 8 ++----- .../broker/service/TaskManagementService.kt | 22 ++++++++++--------- .../src/main/proto/task_result_producer.proto | 2 ++ 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt index eece963a..e3ab269b 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt @@ -36,7 +36,7 @@ class MongoModuleContext : ModuleContext { ConnectionString( System.getProperty( "owl.broker.mongo.url", - "mongodb://agent1.build:27017" + "mongodb://localhost:27017" ) ) ) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt index 3b6c5506..0cfc7f02 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt @@ -109,6 +109,7 @@ data class QueuedTaskMongodb( val task: TaskMongodb, val attempt: Int, val queuedAt: Instant, + val priority:Int, val isActive: Boolean, val timeoutAt: Instant?, val assignedConsumer: String?, @@ -117,13 +118,14 @@ data class QueuedTaskMongodb( fun toQueuedTask(propertySerializerFactory: PropertySerializerFactory): QueuedTask { return QueuedTask( - attempt, - queuedAt, - task.toTask(propertySerializerFactory), - isActive, - timeoutAt, - assignedConsumer?.let { UUID.fromString(it) }, - assignedAt + attempt = attempt, + queuedAt = queuedAt, + task = task.toTask(propertySerializerFactory), + priority = priority, + isActive = isActive, + timeoutAt = timeoutAt, + assignedConsumer = assignedConsumer?.let { UUID.fromString(it) }, + assignedAt = assignedAt ) } @@ -174,6 +176,7 @@ data class QueuedTaskMongodb( TaskMongodb.of(propertySerializerFactory, queuedTask.task), queuedTask.attempt, queuedTask.queuedAt, + queuedTask.priority, queuedTask.isActive, queuedTask.timeoutAt, queuedTask.assignedConsumer?.toString(), diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt index f8c04374..b9dab655 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt @@ -28,6 +28,7 @@ data class QueuedTask( val attempt: Int, val queuedAt: Instant, val task: Task, + val priority: Int, val isActive: Boolean, val timeoutAt: Instant?, val assignedConsumer: UUID?, diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt index 9b930810..287dc449 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt @@ -16,18 +16,14 @@ package dev.usbharu.owl.broker.interfaces.grpc -import TaskResultProducer.TaskResults -import TaskResultSubscribeServiceGrpcKt -import dev.usbharu.owl.Uuid +import dev.usbharu.owl.* import dev.usbharu.owl.broker.external.toUUID import dev.usbharu.owl.broker.service.TaskManagementService import dev.usbharu.owl.common.property.PropertySerializeUtils import dev.usbharu.owl.common.property.PropertySerializerFactory -import dev.usbharu.owl.taskResult import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import org.koin.core.annotation.Singleton -import taskResults import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext @@ -38,7 +34,7 @@ class TaskResultSubscribeService( coroutineContext: CoroutineContext = EmptyCoroutineContext ) : TaskResultSubscribeServiceGrpcKt.TaskResultSubscribeServiceCoroutineImplBase(coroutineContext) { - override fun subscribe(request: Uuid.UUID): Flow { + override fun subscribe(request: Uuid.UUID): Flow { return taskManagementService .subscribeResult(request.toUUID()) .map { diff --git a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index 4cd78e55..066dafa3 100644 --- a/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -83,18 +83,20 @@ class TaskManagementServiceImpl( private suspend fun enqueueTask(task: Task): QueuedTask { - val queuedTask = QueuedTask( - task.attempt + 1, - Instant.now(), - task, - isActive = true, - timeoutAt = null, - null, - null - ) - val definedTask = taskDefinitionRepository.findByName(task.name) ?: throw TaskNotRegisterException("Task ${task.name} not definition.") + + val queuedTask = QueuedTask( + attempt = task.attempt + 1, + queuedAt = Instant.now(), + task = task, + priority = definedTask.priority, + isActive = true, + timeoutAt = null, + assignedConsumer = null, + assignedAt = null + ) + val copy = task.copy( nextRetry = retryPolicyFactory.factory(definedTask.retryPolicy) .nextRetry(Instant.now(), queuedTask.attempt) diff --git a/broker/src/main/proto/task_result_producer.proto b/broker/src/main/proto/task_result_producer.proto index 8ab59a06..6102a020 100644 --- a/broker/src/main/proto/task_result_producer.proto +++ b/broker/src/main/proto/task_result_producer.proto @@ -2,6 +2,8 @@ syntax = "proto3"; import "uuid.proto"; import "task_result.proto"; +option java_package = "dev.usbharu.owl"; + message TaskResults { string name = 1; UUID id = 2; From 4dbffdb2d9f8709d5b36ccd374b3d9e66998ec7d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:52:02 +0900 Subject: [PATCH 20/36] =?UTF-8?q?feat:=20Queue=E3=81=AE=E5=89=B2=E5=BD=93?= =?UTF-8?q?=E3=81=AB=E5=84=AA=E5=85=88=E9=A0=86=E4=BD=8D=E3=81=8C=E9=81=A9?= =?UTF-8?q?=E7=94=A8=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt index 0cfc7f02..343b5c21 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt @@ -20,6 +20,7 @@ import com.mongodb.client.model.Filters.* import com.mongodb.client.model.FindOneAndUpdateOptions import com.mongodb.client.model.ReplaceOptions import com.mongodb.client.model.ReturnDocument +import com.mongodb.client.model.Sorts import com.mongodb.client.model.Updates.set import com.mongodb.kotlin.client.coroutine.MongoDatabase import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask @@ -88,7 +89,7 @@ class MongodbQueuedTaskRepository( `in`("task.name", tasks), eq(QueuedTaskMongodb::isActive.name, true) ) - ).map { it.toQueuedTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) + ).sort(Sorts.descending("priority")).map { it.toQueuedTask(propertySerializerFactory) }.flowOn(Dispatchers.IO) } override fun findByQueuedAtBeforeAndIsActiveIsTrue(instant: Instant): Flow { From be59b5e44632dba3e09927986f5ec7cc3d0df03e Mon Sep 17 00:00:00 2001 From: usbharu Date: Sun, 31 Mar 2024 09:37:04 +0900 Subject: [PATCH 21/36] =?UTF-8?q?feat:=20=E3=83=93=E3=83=AB=E3=83=80?= =?UTF-8?q?=E3=83=BC=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../owl/producer/api/OwlProducerBuilder.kt | 22 +++++++++++++++++++ .../producer/api/OwlProducerBuilderConfig.kt | 21 ++++++++++++++++++ ...roducerFactory.kt => OwlProducerConfig.kt} | 5 +---- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt create mode 100644 producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt rename producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/{OwlProducerFactory.kt => OwlProducerConfig.kt} (87%) diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt new file mode 100644 index 00000000..e49d5f3e --- /dev/null +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.producer.api + +interface OwlProducerBuilder { + fun config(): T + fun apply(owlProducerConfig: T) +} \ No newline at end of file diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt new file mode 100644 index 00000000..d4a5288e --- /dev/null +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.producer.api + +fun , C : OwlProducerConfig> OWL(owlProducerBuilder: T, config: C.() -> Unit) { + owlProducerBuilder.apply(owlProducerBuilder.config().apply { config() }) +} \ No newline at end of file diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerFactory.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt similarity index 87% rename from producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerFactory.kt rename to producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt index 419689bf..557547ce 100644 --- a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerFactory.kt +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt @@ -16,8 +16,5 @@ package dev.usbharu.owl.producer.api -object OwlProducerFactory { - fun createProducer():OwlProducer{ - TODO() - } +interface OwlProducerConfig { } \ No newline at end of file From 7bdb4719f50c587fa2dc1b01dc9b99a66596628b Mon Sep 17 00:00:00 2001 From: usbharu Date: Sun, 31 Mar 2024 12:12:20 +0900 Subject: [PATCH 22/36] =?UTF-8?q?feat:=20Producer=E3=81=AE=E3=83=87?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E5=AE=9F=E8=A3=85=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/src/main/proto/publish_task.proto | 1 - .../owl/common/task/PropertyDefinition.kt | 8 +- .../usbharu/owl/common/task/TaskDefinition.kt | 4 +- .../usbharu/owl/producer/api/OwlProducer.kt | 2 + .../owl/producer/api/OwlProducerBuilder.kt | 4 +- .../producer/api/OwlProducerBuilderConfig.kt | 7 +- producer/default/build.gradle.kts | 55 ++++++++++++ .../defaultimpl/DefaultOwlProducer.kt | 90 +++++++++++++++++++ .../defaultimpl/DefaultOwlProducerBuilder.kt | 47 ++++++++++ .../defaultimpl/DefaultOwlProducerConfig.kt} | 17 ++-- producer/impl/build.gradle.kts | 21 ----- .../producer/impl/DefaultOwlProducer.kt | 32 ------- .../impl/datasource/DatasourceFactory.kt | 23 ----- .../ServiceProviderDatasourceFactory.kt | 32 ------- settings.gradle.kts | 4 +- 15 files changed, 222 insertions(+), 125 deletions(-) create mode 100644 producer/default/build.gradle.kts create mode 100644 producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt create mode 100644 producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt rename producer/{impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt => default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt} (58%) delete mode 100644 producer/impl/build.gradle.kts delete mode 100644 producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt delete mode 100644 producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt delete mode 100644 producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt diff --git a/broker/src/main/proto/publish_task.proto b/broker/src/main/proto/publish_task.proto index 9194077a..620e6396 100644 --- a/broker/src/main/proto/publish_task.proto +++ b/broker/src/main/proto/publish_task.proto @@ -3,7 +3,6 @@ syntax = "proto3"; import "google/protobuf/timestamp.proto"; import "uuid.proto"; -import "property.proto"; option java_package = "dev.usbharu.owl"; diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt index 44c149b2..11f8dcda 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt @@ -18,6 +18,12 @@ package dev.usbharu.owl.common.task import dev.usbharu.owl.common.property.PropertyType -class PropertyDefinition(val map: Map) : Map by map{ +class PropertyDefinition(val map: Map) : Map by map { + fun hash(): Long { + var hash = 1L + map.map { it.key + it.value.name }.joinToString("").map { hash *= it.code * 31 } + return hash + } + } diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt index 8c766c34..d62b94de 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt @@ -17,15 +17,15 @@ package dev.usbharu.owl.common.task import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.retry.RetryPolicy interface TaskDefinition { val name: String val priority: Int val maxRetry: Int - val retryPolicy:RetryPolicy + val retryPolicy: String val timeoutMilli: Long val propertyDefinition: PropertyDefinition + val type: Class fun serialize(task: T): Map> fun deserialize(value: Map>): T diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt index e4df89ab..b15d1d28 100644 --- a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt @@ -22,6 +22,8 @@ import dev.usbharu.owl.common.task.TaskDefinition interface OwlProducer { + suspend fun start() + suspend fun registerTask(taskDefinition: TaskDefinition) suspend fun publishTask(task: T): PublishedTask } diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt index e49d5f3e..4d1c21ab 100644 --- a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt @@ -16,7 +16,9 @@ package dev.usbharu.owl.producer.api -interface OwlProducerBuilder { +interface OwlProducerBuilder

{ fun config(): T fun apply(owlProducerConfig: T) + + fun build(): P } \ No newline at end of file diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt index d4a5288e..2b6548f0 100644 --- a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt @@ -16,6 +16,9 @@ package dev.usbharu.owl.producer.api -fun , C : OwlProducerConfig> OWL(owlProducerBuilder: T, config: C.() -> Unit) { - owlProducerBuilder.apply(owlProducerBuilder.config().apply { config() }) +fun

, C : OwlProducerConfig> OWL( + owlProducerBuilder: T, + configBlock: C.() -> Unit +) { + owlProducerBuilder.apply(owlProducerBuilder.config().apply { configBlock() }) } \ No newline at end of file diff --git a/producer/default/build.gradle.kts b/producer/default/build.gradle.kts new file mode 100644 index 00000000..722c7de8 --- /dev/null +++ b/producer/default/build.gradle.kts @@ -0,0 +1,55 @@ +plugins { + kotlin("jvm") + id("com.google.protobuf") version "0.9.4" +} + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation("org.jetbrains.kotlin:kotlin-test") + implementation(project(":producer:api")) + implementation("io.grpc:grpc-kotlin-stub:1.4.1") + implementation("io.grpc:grpc-protobuf:1.61.1") + implementation("com.google.protobuf:protobuf-kotlin:3.25.3") + implementation("io.grpc:grpc-netty:1.61.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") + implementation(project(":common")) + protobuf(files(project(":broker").dependencyProject.projectDir.toString() + "/src/main/proto")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} + +protobuf { + protoc { + artifact = "com.google.protobuf:protoc:3.25.3" + } + plugins { + create("grpc") { + artifact = "io.grpc:protoc-gen-grpc-java:1.61.1" + } + create("grpckt") { + artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" + } + } + generateProtoTasks { + all().forEach { + it.plugins { + create("grpc") + create("grpckt") + } + it.builtins { + create("kotlin") + } + } + } +} \ No newline at end of file diff --git a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt new file mode 100644 index 00000000..573fba71 --- /dev/null +++ b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.dev.usbharu.owl.producer.defaultimpl + +import com.google.protobuf.timestamp +import dev.usbharu.owl.* +import dev.usbharu.owl.Uuid.UUID +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.task.PublishedTask +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition +import dev.usbharu.owl.producer.api.OwlProducer +import java.time.Instant + +class DefaultOwlProducer(private val defaultOwlProducerConfig: DefaultOwlProducerConfig) : OwlProducer { + + lateinit var producerId: UUID + lateinit var producerServiceCoroutineStub: ProducerServiceGrpcKt.ProducerServiceCoroutineStub + lateinit var defineTaskServiceCoroutineStub: DefinitionTaskServiceGrpcKt.DefinitionTaskServiceCoroutineStub + lateinit var taskPublishServiceCoroutineStub: TaskPublishServiceGrpcKt.TaskPublishServiceCoroutineStub + val map = mutableMapOf, TaskDefinition<*>>() + override suspend fun start() { + producerServiceCoroutineStub = + ProducerServiceGrpcKt.ProducerServiceCoroutineStub(defaultOwlProducerConfig.channel) + producerId = producerServiceCoroutineStub.registerProducer(producer { + this.name = defaultOwlProducerConfig.name + this.hostname = defaultOwlProducerConfig.hostname + }).id + + defineTaskServiceCoroutineStub = + DefinitionTaskServiceGrpcKt.DefinitionTaskServiceCoroutineStub(defaultOwlProducerConfig.channel) + + taskPublishServiceCoroutineStub = + TaskPublishServiceGrpcKt.TaskPublishServiceCoroutineStub(defaultOwlProducerConfig.channel) + } + + + override suspend fun registerTask(taskDefinition: TaskDefinition) { + defineTaskServiceCoroutineStub.register(taskDefinition { + this.producerId = this@DefaultOwlProducer.producerId + this.name = taskDefinition.name + this.maxRetry = taskDefinition.maxRetry + this.priority = taskDefinition.priority + this.retryPolicy = taskDefinition.retryPolicy + this.timeoutMilli = taskDefinition.timeoutMilli + this.propertyDefinitionHash = taskDefinition.propertyDefinition.hash() + }) + } + + override suspend fun publishTask(task: T): PublishedTask { + val taskDefinition = map.getValue(task::class.java) as TaskDefinition + val properties = PropertySerializeUtils.serialize( + defaultOwlProducerConfig.propertySerializerFactory, + taskDefinition.serialize(task) + ) + val now = Instant.now() + val publishTask = taskPublishServiceCoroutineStub.publishTask( + dev.usbharu.owl.publishTask { + this.producerId = this@DefaultOwlProducer.producerId + + this.publishedAt = timestamp { + this.seconds = now.epochSecond + this.nanos = now.nano + } + this.name = taskDefinition.name + this.properties.putAll(properties) + } + ) + + return PublishedTask( + task, + java.util.UUID(publishTask.id.mostSignificantUuidBits, publishTask.id.leastSignificantUuidBits), + now + ) + } +} \ No newline at end of file diff --git a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt new file mode 100644 index 00000000..8ebaaf1c --- /dev/null +++ b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.dev.usbharu.owl.producer.defaultimpl + +import dev.usbharu.owl.producer.api.OwlProducerBuilder +import io.grpc.ManagedChannelBuilder + +class DefaultOwlProducerBuilder : OwlProducerBuilder { + + var config: DefaultOwlProducerConfig = config() + + override fun config(): DefaultOwlProducerConfig { + val defaultOwlProducerConfig = DefaultOwlProducerConfig() + + with(defaultOwlProducerConfig) { + channel = ManagedChannelBuilder.forAddress("localhost", 50051).usePlaintext().build() + } + + return defaultOwlProducerConfig + } + + override fun build(): DefaultOwlProducer { + return DefaultOwlProducer( + config + ) + } + + override fun apply(owlProducerConfig: DefaultOwlProducerConfig) { + this.config = owlProducerConfig + } +} + +val DEFAULT by lazy { DefaultOwlProducerBuilder() } \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt similarity index 58% rename from producer/impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt rename to producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt index 7c9410aa..527e1d04 100644 --- a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/OwlTaskDatasource.kt +++ b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt @@ -14,14 +14,15 @@ * limitations under the License. */ -package dev.usbharu.producer.impl +package dev.usbharu.dev.usbharu.owl.producer.defaultimpl -import dev.usbharu.owl.common.task.PublishedTask -import dev.usbharu.owl.common.task.Task -import dev.usbharu.owl.common.task.TaskDefinition +import dev.usbharu.owl.common.property.PropertySerializerFactory +import dev.usbharu.owl.producer.api.OwlProducerConfig +import io.grpc.Channel -interface OwlTaskDatasource { - - suspend fun registerTask(definition: TaskDefinition) - suspend fun publishTask(publishedTask: PublishedTask) +class DefaultOwlProducerConfig : OwlProducerConfig { + lateinit var channel: Channel + lateinit var name: String + lateinit var hostname: String + lateinit var propertySerializerFactory: PropertySerializerFactory } \ No newline at end of file diff --git a/producer/impl/build.gradle.kts b/producer/impl/build.gradle.kts deleted file mode 100644 index 87bf53a1..00000000 --- a/producer/impl/build.gradle.kts +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - kotlin("jvm") -} - -group = "dev.usbharu" -version = "0.0.1" - -repositories { - mavenCentral() -} - -dependencies { - implementation(project(":producer:api")) -} - -tasks.test { - useJUnitPlatform() -} -kotlin { - jvmToolchain(17) -} \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt deleted file mode 100644 index 1607a62b..00000000 --- a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/DefaultOwlProducer.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * 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 dev.usbharu.producer.impl - -import dev.usbharu.owl.common.task.PublishedTask -import dev.usbharu.owl.common.task.Task -import dev.usbharu.owl.common.task.TaskDefinition -import dev.usbharu.owl.producer.api.OwlProducer - -class DefaultOwlProducer : OwlProducer { - override suspend fun registerTask(taskDefinition: TaskDefinition) { - TODO("Not yet implemented") - } - - override suspend fun publishTask(task: T): PublishedTask { - TODO("Not yet implemented") - } -} \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt deleted file mode 100644 index 293ba15b..00000000 --- a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/DatasourceFactory.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * 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 dev.usbharu.producer.impl.datasource - -import dev.usbharu.producer.impl.OwlTaskDatasource - -interface DatasourceFactory { - suspend fun create():OwlTaskDatasource -} \ No newline at end of file diff --git a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt b/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt deleted file mode 100644 index f198a270..00000000 --- a/producer/impl/src/main/kotlin/dev/usbharu/producer/impl/datasource/ServiceProviderDatasourceFactory.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * 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 dev.usbharu.producer.impl.datasource - -import dev.usbharu.producer.impl.OwlTaskDatasource -import java.util.ServiceLoader -import kotlin.jvm.optionals.getOrElse -import kotlin.jvm.optionals.getOrNull - -class ServiceProviderDatasourceFactory : DatasourceFactory { - override suspend fun create(): OwlTaskDatasource { - val serviceLoader: ServiceLoader = ServiceLoader.load(OwlTaskDatasource::class.java) - - return serviceLoader.findFirst().getOrElse { - throw IllegalStateException("") - } - } -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 8e2a06bc..f447b5a2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,8 +5,8 @@ rootProject.name = "owl" include("common") include("producer:api") findProject(":producer:api")?.name = "api" -include("producer:impl") -findProject(":producer:impl")?.name = "impl" include("broker") include("broker:broker-mongodb") findProject(":broker:broker-mongodb")?.name = "broker-mongodb" +include("producer:default") +findProject(":producer:default")?.name = "default" From f3a1761f1df5597c333dba1708881101abe94a36 Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 1 Apr 2024 15:22:31 +0900 Subject: [PATCH 23/36] feat: wip consumer --- consumer/build.gradle.kts | 54 ++++++++++++++++++++++++++++++++ consumer/src/main/kotlin/Main.kt | 36 +++++++++++++++++++++ settings.gradle.kts | 1 + 3 files changed, 91 insertions(+) create mode 100644 consumer/build.gradle.kts create mode 100644 consumer/src/main/kotlin/Main.kt diff --git a/consumer/build.gradle.kts b/consumer/build.gradle.kts new file mode 100644 index 00000000..4137b56a --- /dev/null +++ b/consumer/build.gradle.kts @@ -0,0 +1,54 @@ +plugins { + kotlin("jvm") + id("com.google.protobuf") version "0.9.4" +} + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation("org.jetbrains.kotlin:kotlin-test") + implementation("io.grpc:grpc-kotlin-stub:1.4.1") + implementation("io.grpc:grpc-protobuf:1.61.1") + implementation("com.google.protobuf:protobuf-kotlin:3.25.3") + implementation("io.grpc:grpc-netty:1.61.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") + implementation(project(":common")) + protobuf(files(project(":broker").dependencyProject.projectDir.toString() + "/src/main/proto")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} + +protobuf { + protoc { + artifact = "com.google.protobuf:protoc:3.25.3" + } + plugins { + create("grpc") { + artifact = "io.grpc:protoc-gen-grpc-java:1.61.1" + } + create("grpckt") { + artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" + } + } + generateProtoTasks { + all().forEach { + it.plugins { + create("grpc") + create("grpckt") + } + it.builtins { + create("kotlin") + } + } + } +} \ No newline at end of file diff --git a/consumer/src/main/kotlin/Main.kt b/consumer/src/main/kotlin/Main.kt new file mode 100644 index 00000000..3fa8f959 --- /dev/null +++ b/consumer/src/main/kotlin/Main.kt @@ -0,0 +1,36 @@ +package dev.usbharu + +import dev.usbharu.owl.AssignmentTaskServiceGrpcKt +import dev.usbharu.owl.readyRequest +import io.grpc.ManagedChannelBuilder +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.isActive +import kotlinx.coroutines.withContext + +suspend fun main() { + withContext(Dispatchers.Default) { + var isReady = true + AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub( + ManagedChannelBuilder.forAddress( + "localhost", 50051 + ).build() + ).ready(flow { + while (isActive) { + if (isReady) { + emit(readyRequest { + this.consumerId + }) + } + delay(500) + } + }).onEach { + + }.collect() + + + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index f447b5a2..87d7071c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,3 +10,4 @@ include("broker:broker-mongodb") findProject(":broker:broker-mongodb")?.name = "broker-mongodb" include("producer:default") findProject(":producer:default")?.name = "default" +include("consumer") From 2e68e2ab1b346d629677fc53594b3a171fa57605 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 1 Apr 2024 17:14:15 +0900 Subject: [PATCH 24/36] =?UTF-8?q?feat:=20Consumer=E3=81=A7=E5=90=8C?= =?UTF-8?q?=E6=99=82=E5=AE=9F=E8=A1=8C=E6=95=B0=E3=82=92=E5=88=B6=E5=BE=A1?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consumer/src/main/kotlin/Main.kt | 109 ++++++++++++++++++++++++------- 1 file changed, 86 insertions(+), 23 deletions(-) diff --git a/consumer/src/main/kotlin/Main.kt b/consumer/src/main/kotlin/Main.kt index 3fa8f959..c3266f38 100644 --- a/consumer/src/main/kotlin/Main.kt +++ b/consumer/src/main/kotlin/Main.kt @@ -1,36 +1,99 @@ package dev.usbharu -import dev.usbharu.owl.AssignmentTaskServiceGrpcKt -import dev.usbharu.owl.readyRequest +import dev.usbharu.owl.* import io.grpc.ManagedChannelBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay +import kotlinx.coroutines.* import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.isActive -import kotlinx.coroutines.withContext +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +import kotlin.math.max suspend fun main() { - withContext(Dispatchers.Default) { - var isReady = true - AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub( - ManagedChannelBuilder.forAddress( - "localhost", 50051 - ).build() - ).ready(flow { - while (isActive) { - if (isReady) { - emit(readyRequest { - this.consumerId - }) - } - delay(500) - } - }).onEach { - }.collect() + val channel = ManagedChannelBuilder.forAddress( + "localhost", 50051 + ).build() + val subscribeTaskServiceCoroutineStub = SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub(channel) + val assignmentTaskServiceCoroutineStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub( + channel + ) + val taskResultServiceCoroutineStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) + + val subscribeTask = subscribeTaskServiceCoroutineStub.subscribeTask(subscribeTaskRequest { + this.name = "" + this.hostname = "" + this.tasks.addAll(listOf()) + }) + + var concurrent = 64 + val concurrentMutex = Mutex() + var processing = 0 + val processingMutex = Mutex() + + coroutineScope { + launch(Dispatchers.Default) { + taskResultServiceCoroutineStub.tasKResult(flow { + assignmentTaskServiceCoroutineStub + .ready( + flow { + while (isActive) { + val andSet = concurrentMutex.withLock { + val andSet = concurrent + concurrent = 0 + andSet + } + if (andSet != 0) { + emit(readyRequest { + this.consumerId = subscribeTask.id + this.numberOfConcurrent = andSet + }) + continue + } + delay(100) + + val withLock = processingMutex.withLock { + processing + } + concurrentMutex.withLock { + concurrent = ((64 - concurrent) - withLock).coerceIn(0, 64 - max(0, withLock)) + } + } + } + ) + .onEach { + processingMutex.withLock { + processing++ + } + try { + emit(taskResult { + + }) + + } catch (e: Exception) { + emit(taskResult { + this.success = false + }) + } finally { + processingMutex.withLock { + processing-- + } + concurrentMutex.withLock { + if (concurrent < 64) { + concurrent++ + } else { + concurrent = 64 + } + } + } + } + .flowOn(Dispatchers.Default) + .collect() + }) + } } } \ No newline at end of file From 74dbd04f0bae0accbc55de46c5b280128a99da8d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 1 Apr 2024 17:41:53 +0900 Subject: [PATCH 25/36] =?UTF-8?q?feat:=20Mutex=E3=81=A7=E3=81=AF=E3=81=AA?= =?UTF-8?q?=E3=81=8FStateFlow=E3=82=92=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consumer/src/main/kotlin/Main.kt | 56 ++++++++++++++------------------ 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/consumer/src/main/kotlin/Main.kt b/consumer/src/main/kotlin/Main.kt index c3266f38..e805e8d1 100644 --- a/consumer/src/main/kotlin/Main.kt +++ b/consumer/src/main/kotlin/Main.kt @@ -2,13 +2,12 @@ package dev.usbharu import dev.usbharu.owl.* import io.grpc.ManagedChannelBuilder -import kotlinx.coroutines.* -import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.flowOn -import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.sync.Mutex -import kotlinx.coroutines.sync.withLock +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.* +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch import kotlin.math.max suspend fun main() { @@ -30,10 +29,9 @@ suspend fun main() { this.tasks.addAll(listOf()) }) - var concurrent = 64 - val concurrentMutex = Mutex() - var processing = 0 - val processingMutex = Mutex() + val concurrent = MutableStateFlow(64) + val processing = MutableStateFlow(0) + coroutineScope { launch(Dispatchers.Default) { @@ -41,12 +39,13 @@ suspend fun main() { assignmentTaskServiceCoroutineStub .ready( flow { - while (isActive) { - val andSet = concurrentMutex.withLock { - val andSet = concurrent - concurrent = 0 - andSet + while (this@coroutineScope.isActive) { + + val andSet = concurrent.getAndUpdate { + 0 } + + if (andSet != 0) { emit(readyRequest { this.consumerId = subscribeTask.id @@ -56,19 +55,16 @@ suspend fun main() { } delay(100) - val withLock = processingMutex.withLock { - processing - } - concurrentMutex.withLock { - concurrent = ((64 - concurrent) - withLock).coerceIn(0, 64 - max(0, withLock)) + concurrent.update { + ((64 - it) - processing.value).coerceIn(0, 64 - max(0, processing.value)) } } } ) .onEach { - processingMutex.withLock { - processing++ - } + + processing.update { it + 1 } + try { emit(taskResult { @@ -79,14 +75,12 @@ suspend fun main() { this.success = false }) } finally { - processingMutex.withLock { - processing-- - } - concurrentMutex.withLock { - if (concurrent < 64) { - concurrent++ + processing.update { it - 1 } + concurrent.update { + if (it < 64) { + it + 1 } else { - concurrent = 64 + 64 } } } From 3e23662b95e1aa7ceb871e072d90262914abc80f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 3 Apr 2024 12:50:49 +0900 Subject: [PATCH 26/36] =?UTF-8?q?feat:=20=E3=82=BF=E3=82=B9=E3=82=AF?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E9=83=A8=E5=88=86=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consumer/src/main/kotlin/Main.kt | 40 ++++++++++++++++++- .../dev/usbharu/owl/consumer/TaskRequest.kt | 29 ++++++++++++++ .../dev/usbharu/owl/consumer/TaskResult.kt | 25 ++++++++++++ .../dev/usbharu/owl/consumer/TaskRunner.kt | 21 ++++++++++ 4 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt diff --git a/consumer/src/main/kotlin/Main.kt b/consumer/src/main/kotlin/Main.kt index e805e8d1..3ff2d4a9 100644 --- a/consumer/src/main/kotlin/Main.kt +++ b/consumer/src/main/kotlin/Main.kt @@ -1,6 +1,10 @@ package dev.usbharu +import dev.usbharu.dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner import dev.usbharu.owl.* +import dev.usbharu.owl.common.property.CustomPropertySerializerFactory +import dev.usbharu.owl.common.property.PropertySerializeUtils import io.grpc.ManagedChannelBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope @@ -8,6 +12,8 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.* import kotlinx.coroutines.isActive import kotlinx.coroutines.launch +import java.time.Instant +import java.util.* import kotlin.math.max suspend fun main() { @@ -29,6 +35,11 @@ suspend fun main() { this.tasks.addAll(listOf()) }) + + val map = mapOf() + + val propertySerializerFactory = CustomPropertySerializerFactory(setOf()) + val concurrent = MutableStateFlow(64) val processing = MutableStateFlow(0) @@ -66,13 +77,40 @@ suspend fun main() { processing.update { it + 1 } try { - emit(taskResult { + val taskResult = map[it.name]?.run( + TaskRequest( + it.name, + UUID(it.id.mostSignificantUuidBits, it.id.leastSignificantUuidBits), + it.attempt, + Instant.ofEpochSecond(it.queuedAt.seconds, it.queuedAt.nanos.toLong()), + PropertySerializeUtils.deserialize(propertySerializerFactory, it.propertiesMap) + ) + ) + + if (taskResult == null) { + throw Exception() + } + + emit(taskResult { + this.success = taskResult.success + this.attempt = it.attempt + this.id = it.id + this.result.putAll( + PropertySerializeUtils.serialize( + propertySerializerFactory, + taskResult.result + ) + ) + this.message = taskResult.message }) } catch (e: Exception) { emit(taskResult { this.success = false + this.attempt = it.attempt + this.id = it.id + this.message = e.localizedMessage }) } finally { processing.update { it - 1 } diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt new file mode 100644 index 00000000..d66e9a73 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.dev.usbharu.owl.consumer + +import dev.usbharu.owl.common.property.PropertyValue +import java.time.Instant +import java.util.* + +data class TaskRequest( + val name:String, + val id:UUID, + val attempt:Int, + val queuedAt: Instant, + val properties:Map> +) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt new file mode 100644 index 00000000..20858a9b --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.dev.usbharu.owl.consumer + +import dev.usbharu.owl.common.property.PropertyValue + +data class TaskResult( + val success: Boolean, + val result: Map>, + val message: String +) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt new file mode 100644 index 00000000..44513ec1 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.dev.usbharu.owl.consumer + +fun interface TaskRunner { + suspend fun run(taskRequest: TaskRequest):TaskResult +} \ No newline at end of file From df35023c02565d2e1210ab46ebb0be2027b79f15 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 3 Apr 2024 13:36:16 +0900 Subject: [PATCH 27/36] =?UTF-8?q?feat:=20Consumer=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consumer/src/main/kotlin/Main.kt | 131 --------------- .../dev/usbharu/owl/consumer/Consumer.kt | 152 ++++++++++++++++++ .../usbharu/owl/consumer/ConsumerConfig.kt | 21 +++ 3 files changed, 173 insertions(+), 131 deletions(-) delete mode 100644 consumer/src/main/kotlin/Main.kt create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt diff --git a/consumer/src/main/kotlin/Main.kt b/consumer/src/main/kotlin/Main.kt deleted file mode 100644 index 3ff2d4a9..00000000 --- a/consumer/src/main/kotlin/Main.kt +++ /dev/null @@ -1,131 +0,0 @@ -package dev.usbharu - -import dev.usbharu.dev.usbharu.owl.consumer.TaskRequest -import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner -import dev.usbharu.owl.* -import dev.usbharu.owl.common.property.CustomPropertySerializerFactory -import dev.usbharu.owl.common.property.PropertySerializeUtils -import io.grpc.ManagedChannelBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.* -import kotlinx.coroutines.isActive -import kotlinx.coroutines.launch -import java.time.Instant -import java.util.* -import kotlin.math.max - -suspend fun main() { - - val channel = ManagedChannelBuilder.forAddress( - "localhost", 50051 - ).build() - val subscribeTaskServiceCoroutineStub = SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub(channel) - - val assignmentTaskServiceCoroutineStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub( - channel - ) - - val taskResultServiceCoroutineStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) - - val subscribeTask = subscribeTaskServiceCoroutineStub.subscribeTask(subscribeTaskRequest { - this.name = "" - this.hostname = "" - this.tasks.addAll(listOf()) - }) - - - val map = mapOf() - - val propertySerializerFactory = CustomPropertySerializerFactory(setOf()) - - val concurrent = MutableStateFlow(64) - val processing = MutableStateFlow(0) - - - coroutineScope { - launch(Dispatchers.Default) { - taskResultServiceCoroutineStub.tasKResult(flow { - assignmentTaskServiceCoroutineStub - .ready( - flow { - while (this@coroutineScope.isActive) { - - val andSet = concurrent.getAndUpdate { - 0 - } - - - if (andSet != 0) { - emit(readyRequest { - this.consumerId = subscribeTask.id - this.numberOfConcurrent = andSet - }) - continue - } - delay(100) - - concurrent.update { - ((64 - it) - processing.value).coerceIn(0, 64 - max(0, processing.value)) - } - } - } - ) - .onEach { - - processing.update { it + 1 } - - try { - - val taskResult = map[it.name]?.run( - TaskRequest( - it.name, - UUID(it.id.mostSignificantUuidBits, it.id.leastSignificantUuidBits), - it.attempt, - Instant.ofEpochSecond(it.queuedAt.seconds, it.queuedAt.nanos.toLong()), - PropertySerializeUtils.deserialize(propertySerializerFactory, it.propertiesMap) - ) - ) - - if (taskResult == null) { - throw Exception() - } - - emit(taskResult { - this.success = taskResult.success - this.attempt = it.attempt - this.id = it.id - this.result.putAll( - PropertySerializeUtils.serialize( - propertySerializerFactory, - taskResult.result - ) - ) - this.message = taskResult.message - }) - - } catch (e: Exception) { - emit(taskResult { - this.success = false - this.attempt = it.attempt - this.id = it.id - this.message = e.localizedMessage - }) - } finally { - processing.update { it - 1 } - concurrent.update { - if (it < 64) { - it + 1 - } else { - 64 - } - } - } - } - .flowOn(Dispatchers.Default) - .collect() - }) - } - } -} \ No newline at end of file diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt new file mode 100644 index 00000000..1ee51d76 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.consumer + +import dev.usbharu.dev.usbharu.owl.consumer.ConsumerConfig +import dev.usbharu.dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner +import dev.usbharu.owl.* +import dev.usbharu.owl.Uuid.UUID +import dev.usbharu.owl.common.property.PropertySerializeUtils +import dev.usbharu.owl.common.property.PropertySerializerFactory +import kotlinx.coroutines.* +import kotlinx.coroutines.flow.* +import org.slf4j.LoggerFactory +import java.time.Instant +import kotlin.math.max + +class Consumer( + private val subscribeTaskServiceCoroutineStub: SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub, + private val assignmentTaskServiceCoroutineStub: AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub, + private val taskResultServiceCoroutineStub: TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub, + private val runnerMap: Map, + private val propertySerializerFactory: PropertySerializerFactory, + consumerConfig: ConsumerConfig +) { + + private lateinit var consumerId: UUID + + private lateinit var coroutineScope: CoroutineScope + + private val concurrent = MutableStateFlow(consumerConfig.concurrent) + private val processing = MutableStateFlow(0) + suspend fun init(name: String, hostname: String) { + logger.info("Initialize Consumer name: {} hostname: {}", name, hostname) + logger.debug("Registered Tasks: {}", runnerMap.keys) + consumerId = subscribeTaskServiceCoroutineStub.subscribeTask(subscribeTaskRequest { + this.name = name + this.hostname = hostname + this.tasks.addAll(runnerMap.keys) + }).id + logger.info("Success initialize consumer. ConsumerID: {}", consumerId) + } + + suspend fun start() { + coroutineScope = CoroutineScope(Dispatchers.Default) + coroutineScope { + taskResultServiceCoroutineStub + .tasKResult(flow { + assignmentTaskServiceCoroutineStub + .ready(flow { + while (coroutineScope.isActive) { + val andSet = concurrent.getAndUpdate { 0 } + + + if (andSet != 0) { + logger.debug("Request {} tasks.", andSet) + emit(readyRequest { + this.consumerId = consumerId + this.numberOfConcurrent = andSet + }) + continue + } + delay(100) + + concurrent.update { + ((64 - it) - processing.value).coerceIn(0, 64 - max(0, processing.value)) + } + } + }).onEach { + logger.info("Start Task name: {}", it.name) + processing.update { it + 1 } + + try { + + val taskResult = runnerMap.getValue(it.name).run( + TaskRequest( + it.name, + java.util.UUID(it.id.mostSignificantUuidBits, it.id.leastSignificantUuidBits), + it.attempt, + Instant.ofEpochSecond(it.queuedAt.seconds, it.queuedAt.nanos.toLong()), + PropertySerializeUtils.deserialize(propertySerializerFactory, it.propertiesMap) + ) + ) + + emit(taskResult { + this.success = taskResult.success + this.attempt = it.attempt + this.id = it.id + this.result.putAll( + PropertySerializeUtils.serialize( + propertySerializerFactory, taskResult.result + ) + ) + this.message = taskResult.message + }) + logger.info("Success execute task. name: {} success: {}", it.name, taskResult.success) + logger.debug("TRACE RESULT {}", taskResult) + } catch (e: CancellationException) { + logger.warn("Cancelled execute task.", e) + emit(taskResult { + this.success = false + this.attempt = it.attempt + this.id = it.id + this.message = e.localizedMessage + }) + throw e + } catch (e: Exception) { + logger.warn("Failed execute task.", e) + emit(taskResult { + this.success = false + this.attempt = it.attempt + this.id = it.id + this.message = e.localizedMessage + }) + } finally { + processing.update { it - 1 } + concurrent.update { + if (it < 64) { + it + 1 + } else { + 64 + } + } + } + }.flowOn(Dispatchers.Default).collect() + }) + } + } + + fun stop() { + logger.info("Stop Consumer. consumerID: {}", consumerId) + coroutineScope.cancel() + } + + companion object { + private val logger = LoggerFactory.getLogger(Consumer::class.java) + } +} \ No newline at end of file diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt new file mode 100644 index 00000000..52bca554 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.dev.usbharu.owl.consumer + +data class ConsumerConfig( + val concurrent:Int, +) From 17ae665441f2733a85eabc4413e3e0818ec8539a Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 15 Apr 2024 11:28:29 +0900 Subject: [PATCH 28/36] =?UTF-8?q?feat:=20wip=20consumer=20Main=E3=81=8B?= =?UTF-8?q?=E3=82=89=E8=B5=B7=E5=8B=95=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usbharu/owl/consumer/ConsumerConfig.kt | 2 + .../kotlin/dev/usbharu/owl/consumer/Main.kt | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt index 52bca554..3ee08539 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt @@ -18,4 +18,6 @@ package dev.usbharu.dev.usbharu.owl.consumer data class ConsumerConfig( val concurrent:Int, + val address: String, + val port: Int ) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt new file mode 100644 index 00000000..785d2808 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.consumer + +import dev.usbharu.dev.usbharu.owl.consumer.ConsumerConfig +import dev.usbharu.owl.AssignmentTaskServiceGrpcKt +import dev.usbharu.owl.SubscribeTaskServiceGrpcKt +import dev.usbharu.owl.TaskResultServiceGrpcKt +import dev.usbharu.owl.common.property.CustomPropertySerializerFactory +import io.grpc.ManagedChannelBuilder +import kotlinx.coroutines.runBlocking + +fun main() { + + val consumerConfig = ConsumerConfig(20, "localhost", 50051) + + val channel = ManagedChannelBuilder.forAddress(consumerConfig.address, consumerConfig.port).usePlaintext().build() + val subscribeTaskServiceCoroutineStub = SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub(channel) + val assignmentTaskServiceCoroutineStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub(channel) + val taskResultServiceCoroutineStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) + val customPropertySerializerFactory = CustomPropertySerializerFactory(emptySet()) + val consumer = Consumer( + subscribeTaskServiceCoroutineStub, assignmentTaskServiceCoroutineStub, taskResultServiceCoroutineStub, + emptyMap(), customPropertySerializerFactory, consumerConfig + ) + + runBlocking { + consumer.start() + } + +} \ No newline at end of file From 416467b5ec09e20d98d1956a3edfe6e72d4f7cbf Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 15 Apr 2024 11:49:05 +0900 Subject: [PATCH 29/36] =?UTF-8?q?feat:=20wip=20consumer=20SPI=E3=81=A7Task?= =?UTF-8?q?Runner=E3=82=92=E3=83=AD=E3=83=BC=E3=83=89=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/owl/consumer/Main.kt | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt index 785d2808..fd8ce00b 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt @@ -17,29 +17,46 @@ package dev.usbharu.owl.consumer import dev.usbharu.dev.usbharu.owl.consumer.ConsumerConfig +import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner import dev.usbharu.owl.AssignmentTaskServiceGrpcKt import dev.usbharu.owl.SubscribeTaskServiceGrpcKt import dev.usbharu.owl.TaskResultServiceGrpcKt import dev.usbharu.owl.common.property.CustomPropertySerializerFactory import io.grpc.ManagedChannelBuilder import kotlinx.coroutines.runBlocking +import java.util.* fun main() { val consumerConfig = ConsumerConfig(20, "localhost", 50051) val channel = ManagedChannelBuilder.forAddress(consumerConfig.address, consumerConfig.port).usePlaintext().build() - val subscribeTaskServiceCoroutineStub = SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub(channel) - val assignmentTaskServiceCoroutineStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub(channel) - val taskResultServiceCoroutineStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) + val subscribeStub = SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub(channel) + val assignmentTaskStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub(channel) + val taskResultStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) val customPropertySerializerFactory = CustomPropertySerializerFactory(emptySet()) + + val taskRunnerMap = ServiceLoader + .load(TaskRunner::class.java) + .associateBy { it::class.qualifiedName!! } + .filterNot { it.key.isBlank() } + val consumer = Consumer( - subscribeTaskServiceCoroutineStub, assignmentTaskServiceCoroutineStub, taskResultServiceCoroutineStub, - emptyMap(), customPropertySerializerFactory, consumerConfig + subscribeStub, + assignmentTaskStub, + taskResultStub, + taskRunnerMap, + customPropertySerializerFactory, + consumerConfig ) runBlocking { + consumer.init("consumer", "consumer-1") consumer.start() + + Runtime.getRuntime().addShutdownHook(Thread { + consumer.stop() + }) } } \ No newline at end of file From 786740e2946109daf6375b822e8e283ee1053851 Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 15 Apr 2024 14:46:10 +0900 Subject: [PATCH 30/36] =?UTF-8?q?feat:=20Consumer=E3=81=AE=E3=81=BF?= =?UTF-8?q?=E3=81=A7=E8=B5=B7=E5=8B=95=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D?= =?UTF-8?q?=E3=81=AE=E3=82=A8=E3=83=B3=E3=83=88=E3=83=AA=E3=83=BC=E3=83=9D?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/usbharu/owl/consumer/Consumer.kt | 13 ++- .../usbharu/owl/consumer/ConsumerConfig.kt | 6 +- .../kotlin/dev/usbharu/owl/consumer/Main.kt | 39 +-------- .../owl/consumer/StandaloneConsumer.kt | 80 +++++++++++++++++++ .../owl/consumer/StandaloneConsumerConfig.kt | 25 ++++++ .../StandaloneConsumerConfigLoader.kt | 36 +++++++++ 6 files changed, 152 insertions(+), 47 deletions(-) create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt create mode 100644 consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt index 1ee51d76..d8a8aadd 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt @@ -16,7 +16,6 @@ package dev.usbharu.owl.consumer -import dev.usbharu.dev.usbharu.owl.consumer.ConsumerConfig import dev.usbharu.dev.usbharu.owl.consumer.TaskRequest import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner import dev.usbharu.owl.* @@ -30,9 +29,9 @@ import java.time.Instant import kotlin.math.max class Consumer( - private val subscribeTaskServiceCoroutineStub: SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub, - private val assignmentTaskServiceCoroutineStub: AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub, - private val taskResultServiceCoroutineStub: TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub, + private val subscribeTaskStub: SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub, + private val assignmentTaskStub: AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub, + private val taskResultStub: TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub, private val runnerMap: Map, private val propertySerializerFactory: PropertySerializerFactory, consumerConfig: ConsumerConfig @@ -47,7 +46,7 @@ class Consumer( suspend fun init(name: String, hostname: String) { logger.info("Initialize Consumer name: {} hostname: {}", name, hostname) logger.debug("Registered Tasks: {}", runnerMap.keys) - consumerId = subscribeTaskServiceCoroutineStub.subscribeTask(subscribeTaskRequest { + consumerId = subscribeTaskStub.subscribeTask(subscribeTaskRequest { this.name = name this.hostname = hostname this.tasks.addAll(runnerMap.keys) @@ -58,9 +57,9 @@ class Consumer( suspend fun start() { coroutineScope = CoroutineScope(Dispatchers.Default) coroutineScope { - taskResultServiceCoroutineStub + taskResultStub .tasKResult(flow { - assignmentTaskServiceCoroutineStub + assignmentTaskStub .ready(flow { while (coroutineScope.isActive) { val andSet = concurrent.getAndUpdate { 0 } diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt index 3ee08539..9c340af2 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt @@ -14,10 +14,8 @@ * limitations under the License. */ -package dev.usbharu.dev.usbharu.owl.consumer +package dev.usbharu.owl.consumer data class ConsumerConfig( - val concurrent:Int, - val address: String, - val port: Int + val concurrent: Int ) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt index fd8ce00b..31fba291 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt @@ -16,47 +16,14 @@ package dev.usbharu.owl.consumer -import dev.usbharu.dev.usbharu.owl.consumer.ConsumerConfig -import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner -import dev.usbharu.owl.AssignmentTaskServiceGrpcKt -import dev.usbharu.owl.SubscribeTaskServiceGrpcKt -import dev.usbharu.owl.TaskResultServiceGrpcKt -import dev.usbharu.owl.common.property.CustomPropertySerializerFactory -import io.grpc.ManagedChannelBuilder import kotlinx.coroutines.runBlocking -import java.util.* fun main() { - - val consumerConfig = ConsumerConfig(20, "localhost", 50051) - - val channel = ManagedChannelBuilder.forAddress(consumerConfig.address, consumerConfig.port).usePlaintext().build() - val subscribeStub = SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub(channel) - val assignmentTaskStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub(channel) - val taskResultStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) - val customPropertySerializerFactory = CustomPropertySerializerFactory(emptySet()) - - val taskRunnerMap = ServiceLoader - .load(TaskRunner::class.java) - .associateBy { it::class.qualifiedName!! } - .filterNot { it.key.isBlank() } - - val consumer = Consumer( - subscribeStub, - assignmentTaskStub, - taskResultStub, - taskRunnerMap, - customPropertySerializerFactory, - consumerConfig - ) + val standaloneConsumer = StandaloneConsumer() runBlocking { - consumer.init("consumer", "consumer-1") - consumer.start() - - Runtime.getRuntime().addShutdownHook(Thread { - consumer.stop() - }) + standaloneConsumer.init() + standaloneConsumer.start() } } \ No newline at end of file diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt new file mode 100644 index 00000000..0c430a21 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.consumer + +import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner +import dev.usbharu.owl.AssignmentTaskServiceGrpcKt +import dev.usbharu.owl.SubscribeTaskServiceGrpcKt +import dev.usbharu.owl.TaskResultServiceGrpcKt +import dev.usbharu.owl.common.property.CustomPropertySerializerFactory +import dev.usbharu.owl.common.property.PropertySerializerFactory +import io.grpc.ManagedChannelBuilder +import java.nio.file.Path +import java.util.* + +class StandaloneConsumer( + private val config: StandaloneConsumerConfig, + private val propertySerializerFactory: PropertySerializerFactory +) { + constructor( + path: Path, propertySerializerFactory: PropertySerializerFactory = CustomPropertySerializerFactory( + emptySet() + ) + ) : this(StandaloneConsumerConfigLoader.load(path), propertySerializerFactory) + + constructor(string: String) : this(Path.of(string)) + + constructor() : this(Path.of("consumer.properties")) + + private val channel = ManagedChannelBuilder.forAddress(config.address, config.port) + .usePlaintext() + .build() + + private val subscribeStub = SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub(channel) + private val assignmentTaskStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub(channel) + private val taskResultStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) + + private val taskRunnerMap = ServiceLoader + .load(TaskRunner::class.java) + .associateBy { it::class.qualifiedName!! } + .filterNot { it.key.isBlank() } + + private val consumer = Consumer( + subscribeStub, + assignmentTaskStub, + taskResultStub, + taskRunnerMap, + propertySerializerFactory, + ConsumerConfig(config.concurrency) + ) + + suspend fun init() { + consumer.init(config.name, config.hostname) + } + + suspend fun start() { + consumer.start() + Runtime.getRuntime().addShutdownHook(Thread { + consumer.stop() + }) + } + + fun stop() { + consumer.stop() + } + +} \ No newline at end of file diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt new file mode 100644 index 00000000..b551a0f4 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.consumer + +data class StandaloneConsumerConfig( + val address: String, + val port: Int, + val name: String, + val hostname: String, + val concurrency: Int, +) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt new file mode 100644 index 00000000..0fff6235 --- /dev/null +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2024 usbharu + * + * 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 dev.usbharu.owl.consumer + +import java.nio.file.Files +import java.nio.file.Path +import java.util.* + +object StandaloneConsumerConfigLoader { + fun load(path: Path): StandaloneConsumerConfig { + val properties = Properties() + + properties.load(Files.newInputStream(path)) + + val address = properties.getProperty("address") + val port = properties.getProperty("port").toInt() + val name = properties.getProperty("name") + val hostname = properties.getProperty("hostname") + + return StandaloneConsumerConfig(address, port, name, hostname) + } +} \ No newline at end of file From 86d0366ab5cd66e6596bd51cc0c108da0e886ea8 Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 15 Apr 2024 14:52:01 +0900 Subject: [PATCH 31/36] =?UTF-8?q?fix:=20=E3=83=91=E3=83=A9=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=83=BC=E3=82=92=E5=BF=98=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt index 0fff6235..2ee599ca 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt @@ -30,7 +30,8 @@ object StandaloneConsumerConfigLoader { val port = properties.getProperty("port").toInt() val name = properties.getProperty("name") val hostname = properties.getProperty("hostname") + val concurrency = properties.getProperty("concurrency").toInt() - return StandaloneConsumerConfig(address, port, name, hostname) + return StandaloneConsumerConfig(address, port, name, hostname, concurrency) } } \ No newline at end of file From acd3555f97b9478da3035684b7234ec5c5f2a416 Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 15 Apr 2024 15:05:51 +0900 Subject: [PATCH 32/36] =?UTF-8?q?fix:=20=E3=83=91=E3=83=83=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E5=90=8D=E3=82=92=E4=BF=AE=E6=AD=A3=20map?= =?UTF-8?q?=E3=81=AB=E6=A0=BC=E7=B4=8D=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D?= =?UTF-8?q?=E3=81=AE=E3=82=AD=E3=83=BC=E5=90=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt | 2 -- .../kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt | 4 +--- .../main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt | 2 +- .../src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt | 2 +- .../src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt | 7 ++++--- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt index d8a8aadd..0670500e 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt @@ -16,8 +16,6 @@ package dev.usbharu.owl.consumer -import dev.usbharu.dev.usbharu.owl.consumer.TaskRequest -import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner import dev.usbharu.owl.* import dev.usbharu.owl.Uuid.UUID import dev.usbharu.owl.common.property.PropertySerializeUtils diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt index 0c430a21..2bdfd87c 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt @@ -16,7 +16,6 @@ package dev.usbharu.owl.consumer -import dev.usbharu.dev.usbharu.owl.consumer.TaskRunner import dev.usbharu.owl.AssignmentTaskServiceGrpcKt import dev.usbharu.owl.SubscribeTaskServiceGrpcKt import dev.usbharu.owl.TaskResultServiceGrpcKt @@ -50,8 +49,7 @@ class StandaloneConsumer( private val taskRunnerMap = ServiceLoader .load(TaskRunner::class.java) - .associateBy { it::class.qualifiedName!! } - .filterNot { it.key.isBlank() } + .associateBy { it.name } private val consumer = Consumer( subscribeStub, diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt index d66e9a73..db3a3e4c 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.usbharu.dev.usbharu.owl.consumer +package dev.usbharu.owl.consumer import dev.usbharu.owl.common.property.PropertyValue import java.time.Instant diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt index 20858a9b..0c4f5d33 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.usbharu.dev.usbharu.owl.consumer +package dev.usbharu.owl.consumer import dev.usbharu.owl.common.property.PropertyValue diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt index 44513ec1..b772101f 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt @@ -14,8 +14,9 @@ * limitations under the License. */ -package dev.usbharu.dev.usbharu.owl.consumer +package dev.usbharu.owl.consumer -fun interface TaskRunner { - suspend fun run(taskRequest: TaskRequest):TaskResult +interface TaskRunner { + val name: String + suspend fun run(taskRequest: TaskRequest): TaskResult } \ No newline at end of file From 5349b1a060f1ef9f1b5f81edeb5cccb22925e53c Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 22 Apr 2024 10:58:44 +0900 Subject: [PATCH 33/36] =?UTF-8?q?doc:=20OwlProducer=E3=81=AE=E3=83=89?= =?UTF-8?q?=E3=82=AD=E3=83=A5=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usbharu/owl/producer/api/OwlProducer.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt index b15d1d28..21495894 100644 --- a/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt +++ b/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt @@ -20,10 +20,32 @@ import dev.usbharu.owl.common.task.PublishedTask import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +/** + * タスクを発生させるクライアント + * + */ interface OwlProducer { + /** + * Producerを開始します + * + */ suspend fun start() + /** + * タスク定義を登録します + * + * @param T 登録するタスク + * @param taskDefinition 登録するタスクの定義 + */ suspend fun registerTask(taskDefinition: TaskDefinition) + + /** + * タスクを公開します。タスクは定義済みである必要があります。 + * + * @param T 公開するタスク + * @param task タスクの詳細 + * @return 公開されたタスク + */ suspend fun publishTask(task: T): PublishedTask } From 4e7600d3bf486c27e6a145e4e9240a1096b9b183 Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 22 Apr 2024 12:28:37 +0900 Subject: [PATCH 34/36] =?UTF-8?q?doc:=20=E3=83=89=E3=82=AD=E3=83=A5?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../owl/common/property/PropertyValue.kt | 5 +++ .../owl/consumer/StandaloneConsumer.kt | 34 +++++++++++++++---- .../owl/consumer/StandaloneConsumerConfig.kt | 9 +++++ .../StandaloneConsumerConfigLoader.kt | 9 +++++ .../dev/usbharu/owl/consumer/TaskResult.kt | 7 ++++ 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt index 440aa356..f5fc04f7 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt @@ -16,6 +16,11 @@ package dev.usbharu.owl.common.property +/** + * プロパティで使用される値 + * + * @param T プロパティの型 + */ sealed class PropertyValue { abstract val value: T abstract val type: PropertyType diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt index 2bdfd87c..7d1cf295 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt @@ -25,12 +25,19 @@ import io.grpc.ManagedChannelBuilder import java.nio.file.Path import java.util.* +/** + * 単独で起動できるConsumer + * + * @property config Consumerの起動構成 + * @property propertySerializerFactory [dev.usbharu.owl.common.property.PropertyValue]のシリアライザーのファクトリ + */ class StandaloneConsumer( private val config: StandaloneConsumerConfig, private val propertySerializerFactory: PropertySerializerFactory ) { constructor( - path: Path, propertySerializerFactory: PropertySerializerFactory = CustomPropertySerializerFactory( + path: Path, + propertySerializerFactory: PropertySerializerFactory = CustomPropertySerializerFactory( emptySet() ) ) : this(StandaloneConsumerConfigLoader.load(path), propertySerializerFactory) @@ -52,18 +59,27 @@ class StandaloneConsumer( .associateBy { it.name } private val consumer = Consumer( - subscribeStub, - assignmentTaskStub, - taskResultStub, - taskRunnerMap, - propertySerializerFactory, - ConsumerConfig(config.concurrency) + subscribeTaskStub = subscribeStub, + assignmentTaskStub = assignmentTaskStub, + taskResultStub = taskResultStub, + runnerMap = taskRunnerMap, + propertySerializerFactory = propertySerializerFactory, + consumerConfig = ConsumerConfig(config.concurrency) ) + /** + * Consumerを初期化します + * + */ suspend fun init() { consumer.init(config.name, config.hostname) } + /** + * Consumerのワーカーを起動し、タスクの受付を開始します。 + * + * シャットダウンフックに[stop]が登録されます。 + */ suspend fun start() { consumer.start() Runtime.getRuntime().addShutdownHook(Thread { @@ -71,6 +87,10 @@ class StandaloneConsumer( }) } + /** + * Consumerを停止します + * + */ fun stop() { consumer.stop() } diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt index b551a0f4..ff31dde8 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt @@ -16,6 +16,15 @@ package dev.usbharu.owl.consumer +/** + * 単独で起動できるConsumerの構成 + * + * @property address brokerのアドレス + * @property port brokerのポート + * @property name Consumerの名前 + * @property hostname Consumerのホスト名 + * @property concurrency ConsumerのWorkerの最大同時実行数 + */ data class StandaloneConsumerConfig( val address: String, val port: Int, diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt index 2ee599ca..d11bda43 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt @@ -20,7 +20,16 @@ import java.nio.file.Files import java.nio.file.Path import java.util.* +/** + * 単独で起動できるConsumerの構成のローダー + */ object StandaloneConsumerConfigLoader { + /** + * [Path]から構成を読み込みます + * + * @param path 読み込むパス + * @return 読み込まれた構成 + */ fun load(path: Path): StandaloneConsumerConfig { val properties = Properties() diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt index 0c4f5d33..3e21dfb9 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt @@ -18,6 +18,13 @@ package dev.usbharu.owl.consumer import dev.usbharu.owl.common.property.PropertyValue +/** + * タスクの実行結果 + * + * @property success 成功したらtrue + * @property result タスクの実行結果のMap + * @property message その他メッセージ + */ data class TaskResult( val success: Boolean, val result: Map>, From 3315fe20e12ead5c2df72d931a8f3c57d1188218 Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 22 Apr 2024 14:58:26 +0900 Subject: [PATCH 35/36] =?UTF-8?q?doc:=20=E3=83=89=E3=82=AD=E3=83=A5?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPropertySerializerFactory.kt | 6 +++- .../owl/common/property/PropertySerializer.kt | 31 +++++++++++++++++++ .../property/PropertySerializerFactory.kt | 18 +++++++++++ .../dev/usbharu/owl/consumer/Consumer.kt | 28 +++++++++++++++++ .../usbharu/owl/consumer/ConsumerConfig.kt | 5 +++ .../dev/usbharu/owl/consumer/TaskRequest.kt | 9 ++++++ .../dev/usbharu/owl/consumer/TaskRunner.kt | 14 +++++++++ .../defaultimpl/DefaultOwlProducer.kt | 2 +- .../defaultimpl/DefaultOwlProducerBuilder.kt | 2 ++ .../defaultimpl/DefaultOwlProducerConfig.kt | 2 +- 10 files changed, 114 insertions(+), 3 deletions(-) diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt index 3f3e8263..c1d0537b 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt @@ -16,7 +16,11 @@ package dev.usbharu.owl.common.property - +/** + * [Set]でカスタマイズできる[PropertySerializerFactory] + * + * @property propertySerializers [PropertySerializer]の[Set] + */ open class CustomPropertySerializerFactory(private val propertySerializers: Set>) : PropertySerializerFactory { override fun factory(propertyValue: PropertyValue): PropertySerializer { diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt index b1c3bb53..950bd9f4 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt @@ -16,10 +16,41 @@ package dev.usbharu.owl.common.property +/** + * [PropertyValue]をシリアライズ・デシリアライズします + * + * @param T [PropertyValue]の型 + */ interface PropertySerializer { + /** + * [PropertyValue]をサポートしているかを確認します + * + * @param propertyValue 確認する[PropertyValue] + * @return サポートしている場合true + */ fun isSupported(propertyValue: PropertyValue<*>): Boolean + + /** + * シリアライズ済みの[PropertyValue]から[PropertyValue]をサポートしているかを確認します + * + * @param string 確認するシリアライズ済みの[PropertyValue] + * @return サポートしている場合true + */ fun isSupported(string: String): Boolean + + /** + * [PropertyValue]をシリアライズします + * + * @param propertyValue シリアライズする[PropertyValue] + * @return シリアライズ済みの[PropertyValue] + */ fun serialize(propertyValue: PropertyValue<*>): String + /** + * デシリアライズします + * + * @param string シリアライズ済みの[PropertyValue] + * @return デシリアライズされた[PropertyValue] + */ fun deserialize(string: String): PropertyValue } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt index bc18d270..9983d6cf 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt @@ -16,7 +16,25 @@ package dev.usbharu.owl.common.property +/** + * [PropertyValue]のシリアライザーのファクトリ + * + */ interface PropertySerializerFactory { + /** + * [PropertyValue]からシリアライザーを作成します + * + * @param T [PropertyValue]の型 + * @param propertyValue シリアライザーを作成する[PropertyValue] + * @return 作成されたシリアライザー + */ fun factory(propertyValue: PropertyValue): PropertySerializer + + /** + * シリアライズ済みの[PropertyValue]からシリアライザーを作成します + * + * @param string シリアライズ済みの[PropertyValue] + * @return 作成されたシリアライザー + */ fun factory(string: String): PropertySerializer<*> } \ No newline at end of file diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt index 0670500e..40b44201 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt @@ -26,6 +26,19 @@ import org.slf4j.LoggerFactory import java.time.Instant import kotlin.math.max +/** + * Consumer + * + * @property subscribeTaskStub + * @property assignmentTaskStub + * @property taskResultStub + * @property runnerMap + * @property propertySerializerFactory + * @constructor + * TODO + * + * @param consumerConfig + */ class Consumer( private val subscribeTaskStub: SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub, private val assignmentTaskStub: AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub, @@ -41,6 +54,13 @@ class Consumer( private val concurrent = MutableStateFlow(consumerConfig.concurrent) private val processing = MutableStateFlow(0) + + /** + * Consumerを初期化します + * + * @param name Consumer名 + * @param hostname Consumerのホスト名 + */ suspend fun init(name: String, hostname: String) { logger.info("Initialize Consumer name: {} hostname: {}", name, hostname) logger.debug("Registered Tasks: {}", runnerMap.keys) @@ -52,6 +72,10 @@ class Consumer( logger.info("Success initialize consumer. ConsumerID: {}", consumerId) } + /** + * タスクの受付を開始します + * + */ suspend fun start() { coroutineScope = CoroutineScope(Dispatchers.Default) coroutineScope { @@ -138,6 +162,10 @@ class Consumer( } } + /** + * タスクの受付を停止します + * + */ fun stop() { logger.info("Stop Consumer. consumerID: {}", consumerId) coroutineScope.cancel() diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt index 9c340af2..a4609e51 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt @@ -16,6 +16,11 @@ package dev.usbharu.owl.consumer +/** + * Consumerの構成 + * + * @property concurrent Consumerのワーカーの同時実行数 + */ data class ConsumerConfig( val concurrent: Int ) diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt index db3a3e4c..006856f2 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt @@ -20,6 +20,15 @@ import dev.usbharu.owl.common.property.PropertyValue import java.time.Instant import java.util.* +/** + * タスクをConsumerに要求します + * + * @property name タスク名 + * @property id タスクID + * @property attempt 試行回数 + * @property queuedAt タスクがキューに入れられた時間 + * @property properties タスクに渡されたパラメータ + */ data class TaskRequest( val name:String, val id:UUID, diff --git a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt index b772101f..613b0166 100644 --- a/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt +++ b/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt @@ -16,7 +16,21 @@ package dev.usbharu.owl.consumer +/** + * タスクを実行するランナー + * + */ interface TaskRunner { + /** + * 実行するタスク名 + */ val name: String + + /** + * タスクを実行する + * + * @param taskRequest 実行するタスク + * @return タスク実行結果 + */ suspend fun run(taskRequest: TaskRequest): TaskResult } \ No newline at end of file diff --git a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt index 573fba71..33a14e34 100644 --- a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt +++ b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.usbharu.dev.usbharu.owl.producer.defaultimpl +package dev.usbharu.owl.producer.defaultimpl import com.google.protobuf.timestamp import dev.usbharu.owl.* diff --git a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt index 8ebaaf1c..8100088f 100644 --- a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt +++ b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt @@ -17,6 +17,8 @@ package dev.usbharu.dev.usbharu.owl.producer.defaultimpl import dev.usbharu.owl.producer.api.OwlProducerBuilder +import dev.usbharu.owl.producer.defaultimpl.DefaultOwlProducer +import dev.usbharu.owl.producer.defaultimpl.DefaultOwlProducerConfig import io.grpc.ManagedChannelBuilder class DefaultOwlProducerBuilder : OwlProducerBuilder { diff --git a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt index 527e1d04..a5eaddf6 100644 --- a/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt +++ b/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.usbharu.dev.usbharu.owl.producer.defaultimpl +package dev.usbharu.owl.producer.defaultimpl import dev.usbharu.owl.common.property.PropertySerializerFactory import dev.usbharu.owl.producer.api.OwlProducerConfig From c6e40caf502b8d74a0b1878c1b26c4f657b6aa4b Mon Sep 17 00:00:00 2001 From: usbharu Date: Mon, 22 Apr 2024 15:58:51 +0900 Subject: [PATCH 36/36] =?UTF-8?q?doc:=20=E3=83=89=E3=82=AD=E3=83=A5?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/property/BooleanPropertyValue.kt | 9 ++++ .../common/property/DoublePropertyValue.kt | 9 ++++ .../common/property/IntegerPropertyValue.kt | 9 ++++ .../common/property/PropertySerializeUtils.kt | 17 +++++++ .../owl/common/property/PropertyType.kt | 18 +++++++ .../owl/common/property/PropertyValue.kt | 7 +++ .../common/property/StringPropertyValue.kt | 9 ++++ .../common/retry/ExponentialRetryPolicy.kt | 8 +++- .../usbharu/owl/common/retry/RetryPolicy.kt | 13 +++++ .../owl/common/task/PropertyDefinition.kt | 12 +++++ .../usbharu/owl/common/task/PublishedTask.kt | 10 +++- .../dev/usbharu/owl/common/task/Task.kt | 4 ++ .../usbharu/owl/common/task/TaskDefinition.kt | 47 +++++++++++++++++++ 13 files changed, 170 insertions(+), 2 deletions(-) diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt index 0a04685a..b595f31c 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt @@ -1,10 +1,19 @@ package dev.usbharu.owl.common.property +/** + * Boolean型のプロパティ + * + * @property value プロパティ + */ class BooleanPropertyValue(override val value: Boolean) : PropertyValue() { override val type: PropertyType get() = PropertyType.binary } +/** + * [BooleanPropertyValue]のシリアライザー + * + */ class BooleanPropertySerializer : PropertySerializer { override fun isSupported(propertyValue: PropertyValue<*>): Boolean { return propertyValue.value is Boolean diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt index 13156f20..c201cbaa 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt @@ -1,10 +1,19 @@ package dev.usbharu.owl.common.property +/** + * Double型のプロパティ + * + * @property value プロパティ + */ class DoublePropertyValue(override val value: Double) : PropertyValue() { override val type: PropertyType get() = PropertyType.number } +/** + * [DoublePropertyValue]のシリアライザー + * + */ class DoublePropertySerializer : PropertySerializer { override fun isSupported(propertyValue: PropertyValue<*>): Boolean { return propertyValue.value is Double diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt index 42782069..9b49c39c 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt @@ -16,11 +16,20 @@ package dev.usbharu.owl.common.property +/** + * Integer型のプロパティ + * + * @property value プロパティ + */ class IntegerPropertyValue(override val value: Int) : PropertyValue() { override val type: PropertyType get() = PropertyType.number } +/** + * [IntegerPropertyValue]のシリアライザー + * + */ class IntegerPropertySerializer : PropertySerializer { override fun isSupported(propertyValue: PropertyValue<*>): Boolean { return propertyValue.value is Int diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt index 38d7a4b8..248e63f2 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt @@ -16,13 +16,30 @@ package dev.usbharu.owl.common.property +/** + * [PropertySerializer]のユーティリティークラス + */ object PropertySerializeUtils { + /** + * Stringと[PropertyValue]の[Map]から[PropertyValue]をシリアライズし、StringとStringの[Map]として返します + * + * @param serializerFactory シリアライズに使用する[PropertySerializerFactory] + * @param properties シリアライズする[Map] + * @return Stringとシリアライズ済みの[PropertyValue]の[Map] + */ fun serialize( serializerFactory: PropertySerializerFactory, properties: Map> ): Map = properties.map { it.key to serializerFactory.factory(it.value).serialize(it.value) }.toMap() + /** + * Stringとシリアライズ済みの[PropertyValue]の[Map]からシリアライズ済みの[PropertyValue]をデシリアライズし、Stringと[PropertyValue]の[Map]として返します + * + * @param serializerFactory デシリアライズに使用する[PropertySerializerFactory] + * @param properties デシリアライズする[Map] + * @return Stringと[PropertyValue]の[Map] + */ fun deserialize( serializerFactory: PropertySerializerFactory, properties: Map diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt index c9dabae5..4259c62f 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt @@ -16,8 +16,26 @@ package dev.usbharu.owl.common.property +/** + * プロパティの型 + * + */ enum class PropertyType { + /** + * 数字 + * + */ number, + + /** + * 文字列 + * + */ string, + + /** + * バイナリ + * + */ binary } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt index f5fc04f7..c251c54f 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt @@ -22,6 +22,13 @@ package dev.usbharu.owl.common.property * @param T プロパティの型 */ sealed class PropertyValue { + /** + * プロパティ + */ abstract val value: T + + /** + * プロパティの型 + */ abstract val type: PropertyType } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt b/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt index a7030d22..5b4cbaa1 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt @@ -1,10 +1,19 @@ package dev.usbharu.owl.common.property +/** + * String型のプロパティ + * + * @property value プロパティ + */ class StringPropertyValue(override val value: String) : PropertyValue() { override val type: PropertyType get() = PropertyType.string } +/** + * [StringPropertyValue]のシリアライザー + * + */ class StringPropertyValueSerializer : PropertySerializer { override fun isSupported(propertyValue: PropertyValue<*>): Boolean { return propertyValue.value is String diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt index 753746db..b34cacf5 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt @@ -4,8 +4,14 @@ import java.time.Instant import kotlin.math.pow import kotlin.math.roundToLong +/** + * 指数関数的に待機時間が増えるリトライポリシー + * `firstRetrySeconds x attempt ^ 2 - firstRetrySeconds` + * + * @property firstRetrySeconds + */ class ExponentialRetryPolicy(private val firstRetrySeconds: Int = 30) : RetryPolicy { override fun nextRetry(now: Instant, attempt: Int): Instant = - now.plusSeconds(firstRetrySeconds.times((2.0).pow(attempt).roundToLong()) - 30) + now.plusSeconds(firstRetrySeconds.times((2.0).pow(attempt).roundToLong()) - firstRetrySeconds) } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt b/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt index 04a73a00..da6e4ec0 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt @@ -18,6 +18,19 @@ package dev.usbharu.owl.common.retry import java.time.Instant +/** + * リトライポリシー + * + */ interface RetryPolicy { + /** + * 次のリトライ時刻を返します。 + * + * [attempt]を負の値にしてはいけません + * + * @param now 現在の時刻 + * @param attempt 試行回数 + * @return 次のリトライ時刻 + */ fun nextRetry(now: Instant, attempt: Int): Instant } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt index 11f8dcda..cbc96b0b 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt @@ -18,7 +18,19 @@ package dev.usbharu.owl.common.task import dev.usbharu.owl.common.property.PropertyType +/** + * プロパティ定義 + * + * @property map プロパティ名とプロパティタイプの[Map] + */ class PropertyDefinition(val map: Map) : Map by map { + /** + * プロパティ定義のハッシュを求めます + * + * ハッシュ値はプロパティ名とプロパティタイプ名を結合したものを結合し、各文字のUTF-16コードと31を掛け続けたものです。 + * + * @return + */ fun hash(): Long { var hash = 1L map.map { it.key + it.value.name }.joinToString("").map { hash *= it.code * 31 } diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt index 57d55ecb..a0f944e5 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt @@ -17,8 +17,16 @@ package dev.usbharu.owl.common.task import java.time.Instant -import java.util.UUID +import java.util.* +/** + * 公開済みのタスク + * + * @param T タスク + * @property task タスク + * @property id タスクのID + * @property published 公開された時刻 + */ data class PublishedTask( val task: T, val id: UUID, diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt index 2f196e8e..42d8dc03 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt @@ -16,5 +16,9 @@ package dev.usbharu.owl.common.task +/** + * タスク + * + */ open class Task { } \ No newline at end of file diff --git a/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt index d62b94de..b96c12de 100644 --- a/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt +++ b/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt @@ -18,15 +18,62 @@ package dev.usbharu.owl.common.task import dev.usbharu.owl.common.property.PropertyValue +/** + * タスク定義 + * + * @param T タスク + */ interface TaskDefinition { + /** + * タスク名 + */ val name: String + + /** + * 優先度 + */ val priority: Int + + /** + * 最大リトライ数 + */ val maxRetry: Int + + /** + * リトライポリシー名 + * + * ポリシーの解決は各Brokerに依存しています + */ val retryPolicy: String + + /** + * タスク実行時のタイムアウト(ミリ秒) + */ val timeoutMilli: Long + + /** + * プロパティ定義 + */ val propertyDefinition: PropertyDefinition + + /** + * [Task]の[Class] + */ val type: Class + /** + * タスクをシリアライズします. + * プロパティのシリアライズと混同しないようにしてください。 + * @param task シリアライズするタスク + * @return シリアライズされたタスク + */ fun serialize(task: T): Map> + + /** + * タスクをデシリアライズします。 + * プロパティのデシリアライズと混同しないようにしてください + * @param value デシリアライズするタスク + * @return デシリアライズされたタスク + */ fun deserialize(value: Map>): T } \ No newline at end of file