You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2020/05/09 06:30:12 UTC
[incubator-tuweni] branch master updated (3f521e9 -> cf5c7ed)
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git.
from 3f521e9 spotless
new 500c2b5 add integration test job
new 027f724 hide welcome text
new cf5c7ed reuse the resolver across visits
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/master-pr-build.yml | 30 ++++++++++++++++++++++
.../org/apache/tuweni/discovery/DNSDaemon.kt | 19 ++++++++------
.../org/apache/tuweni/discovery/DNSResolver.kt | 6 +++--
gradle/docker/docker-compose.yml | 4 +--
4 files changed, 47 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 02/03: hide welcome text
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 027f72471c3aed37e873a1a8c05c301f4fa5ed94
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 8 23:07:25 2020 -0700
hide welcome text
---
gradle/docker/docker-compose.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle/docker/docker-compose.yml b/gradle/docker/docker-compose.yml
index c7eca70..67c5684 100644
--- a/gradle/docker/docker-compose.yml
+++ b/gradle/docker/docker-compose.yml
@@ -15,8 +15,8 @@ services:
image: tuweni_test
volumes:
- ../../build/libs:/home/gradle/build/libs
- command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" assemble test
+ command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false assemble test
integration-test:
container_name: integration-test
image: tuweni_test
- command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" integrationTest
\ No newline at end of file
+ command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false integrationTest -x test
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 01/03: add integration test job
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 500c2b56ab5a757de5591bfc79ca3d4fe61797e6
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 8 23:02:19 2020 -0700
add integration test job
---
.github/workflows/master-pr-build.yml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml
index 9bd9a4e..dd607c9 100644
--- a/.github/workflows/master-pr-build.yml
+++ b/.github/workflows/master-pr-build.yml
@@ -100,3 +100,33 @@ jobs:
with:
name: Reports
path: "**/build/reports"
+ integration-test:
+ runs-on: ubuntu-latest
+ container:
+ image: tmio/tuweni-build:1.0
+ steps:
+ - uses: actions/checkout@v1
+ with:
+ submodules: true
+ - name: Cache Gradle packages
+ uses: actions/cache@v1
+ with:
+ path: ~/.gradle/caches
+ key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+ restore-keys: ${{ runner.os }}-gradle
+ - name: Cache Maven Repository
+ uses: actions/cache@v1
+ with:
+ path: ~/.m2
+ key: ${{ runner.os }}-m2-${{ hashFiles('**/dependency-versions.gradle') }}
+ restore-keys: ${{ runner.os }}-m2
+ - name: gradle test
+ uses: eskatos/gradle-command-action@v1
+ with:
+ gradle-version: 6.3
+ arguments: integrationTest -x test
+ - name: Upload test reports
+ uses: actions/upload-artifact@v2
+ with:
+ name: Reports
+ path: "**/build/reports"
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 03/03: reuse the resolver across visits
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit cf5c7ed3516a516075ad3a3ea844f7275747b0e0
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 8 23:29:55 2020 -0700
reuse the resolver across visits
---
.../kotlin/org/apache/tuweni/discovery/DNSDaemon.kt | 19 +++++++++++--------
.../kotlin/org/apache/tuweni/discovery/DNSResolver.kt | 6 ++++--
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSDaemon.kt b/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSDaemon.kt
index 17b07f3..afead4d 100644
--- a/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSDaemon.kt
+++ b/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSDaemon.kt
@@ -17,6 +17,8 @@
package org.apache.tuweni.discovery
import org.apache.tuweni.devp2p.EthereumNodeRecord
+import org.xbill.DNS.Resolver
+import org.xbill.DNS.SimpleResolver
import java.util.Timer
import java.util.TimerTask
import java.util.concurrent.atomic.AtomicReference
@@ -28,12 +30,14 @@ import java.util.concurrent.atomic.AtomicReference
* @param seq the sequence number of the root record. If the root record seq is higher, proceed with visit.
* @param enrLink the ENR link to start with, of the form enrtree://PUBKEY@domain
* @param period the period at which to poll DNS records
+ * @param resolver
*/
public class DNSDaemon @JvmOverloads constructor(
private val dnsServer: String? = null,
private val seq: Long = 0,
private val enrLink: String,
- private val period: Long = 60000L
+ private val period: Long = 60000L,
+ private val resolver: Resolver = SimpleResolver(dnsServer)
) {
/**
@@ -45,7 +49,7 @@ public class DNSDaemon @JvmOverloads constructor(
private val records = AtomicReference<EthereumNodeRecord>()
init {
- timer.scheduleAtFixedRate(DNSTimerTask(dnsServer, seq, enrLink, this::updateRecords), 0, period)
+ timer.scheduleAtFixedRate(DNSTimerTask(resolver, seq, enrLink, this::updateRecords), 0, period)
}
private fun updateRecords(records: List<EthereumNodeRecord>) {
@@ -61,15 +65,14 @@ public class DNSDaemon @JvmOverloads constructor(
}
class DNSTimerTask(
- private val dnsServer: String? = null,
- private var seq: Long,
+ private val resolver: Resolver,
+ private val seq: Long,
private val enrLink: String,
- private val records: (List<EthereumNodeRecord>) -> Unit
+ private val records: (List<EthereumNodeRecord>) -> Unit,
+ private val dnsResolver: DNSResolver = DNSResolver(null, seq, resolver)
) : TimerTask() {
override fun run() {
- val resolver = DNSResolver(dnsServer, seq)
- records(resolver.collectAll(enrLink))
- seq = resolver.seq
+ records(dnsResolver.collectAll(enrLink))
}
}
diff --git a/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSResolver.kt b/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSResolver.kt
index 503715d..c61f621 100644
--- a/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSResolver.kt
+++ b/dns-discovery/src/main/kotlin/org/apache/tuweni/discovery/DNSResolver.kt
@@ -40,6 +40,7 @@ import org.xbill.DNS.DClass
import org.xbill.DNS.Message
import org.xbill.DNS.Name
import org.xbill.DNS.Record
+import org.xbill.DNS.Resolver
import org.xbill.DNS.Section
import org.xbill.DNS.SimpleResolver
import org.xbill.DNS.Type
@@ -54,7 +55,8 @@ import org.xbill.DNS.WireParseException
public class DNSResolver @JvmOverloads constructor(
private val dnsServer: String? = null,
- var seq: Long = 0
+ var seq: Long = 0,
+ private val resolver: Resolver = SimpleResolver(dnsServer)
) {
companion object {
@@ -138,7 +140,7 @@ public class DNSResolver @JvmOverloads constructor(
*/
fun resolveRecordRaw(domainName: String): String? {
try {
- val resolver = SimpleResolver(dnsServer)
+
// required as TXT records are quite big, and dnsjava maxes out UDP payload.
resolver.setTCP(true)
val type = Type.TXT
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org