Skip to content

[rc/2.0.11] Add IoTDB Edge distribution: ConfigNode + DataNode merged in one JVM - #18550

Merged
JackieTien97 merged 1 commit into
apache:rc/2.0.11from
JackieTien97:ty-backport-18538-rc-2.0.11
Aug 31, 2026
Merged

[rc/2.0.11] Add IoTDB Edge distribution: ConfigNode + DataNode merged in one JVM#18550
JackieTien97 merged 1 commit into
apache:rc/2.0.11from
JackieTien97:ty-backport-18538-rc-2.0.11

Conversation

@JackieTien97

Copy link
Copy Markdown
Contributor

Motivation

Backport #18538 to rc/2.0.11 so the release includes the IoTDB Edge distribution, which runs ConfigNode and DataNode in one JVM with defaults for resource-constrained deployments.

Changes

  • Cherry-pick the final upstream commit 1106d858f10b567a7f089eae7e518a3c66871c7b, preserving the Edge entry point, packaging, Unix/Windows lifecycle scripts, documentation, and dedicated integration tests and CI workflow.
  • Resolve conflicts in the English and Chinese ConfigNodeMessages catalogs by retaining the release branch's existing messages and adding only the four Edge messages in each locale. Do not import the unrelated audit-subscription message from the upstream conflict context.
  • Add the required Apache license header to the new Edge CI workflow. All other added and removed lines match the upstream PR.

Validation

Validated locally on macOS with JDK 17:

  • mvn clean verify -pl distribution,integration-test -am -P with-integration-tests,EdgeIT -DskipUTs -Dit.test=IoTDBEdgeBasicIT -DfailIfNoTests=false -Dfailsafe.failIfNoSpecifiedTests=false: all 38 modules passed; all 3 Edge tests passed, covering packaged configuration and Tree/Table read/write, including package startup and shutdown.
  • mvn test-compile -DskipTests and mvn test-compile -DskipTests -P with-zh-locale: all 50 modules passed in each locale. Also verified the four localized messages in the compiled EdgeNode class after each build.
  • Spotless, changed shell-script syntax, XML parsing, and English/Chinese message-key and placeholder parity checks passed.
  • Verified all six distribution ZIPs and their SHA-512 checksums. All five existing distributions are still produced and exclude Edge-only configuration and lifecycle scripts.

Windows-specific launcher tests were not run locally; the backported CI workflow includes the Windows test job.

@JackieTien97
JackieTien97 merged commit 012ccad into apache:rc/2.0.11 Aug 31, 2026
21 of 22 checks passed
@JackieTien97
JackieTien97 deleted the ty-backport-18538-rc-2.0.11 branch August 31, 2026 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant