[geode] branch develop updated (f0e6e0d -> 3de464e)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f0e6e0d GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608) add 3de464e GEODE-8481: validate java version and vendor earlier (#6612) No new revisions were added by this update. Summary of changes: dev-tools/release/prepare_rc.sh | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-)
[geode-dotnet-core-client] 02/05: Update resources
This is an automated email from the ASF dual-hosted git repository. mmartell pushed a commit to branch GEODE-9356-create-ci in repository https://gitbox.apache.org/repos/asf/geode-dotnet-core-client.git commit 5109bf8d7a7e7ba19e8ab787e7e6f4759e4bf99b Author: Mike Martell AuthorDate: Sun Jun 13 15:34:27 2021 -0700 Update resources --- ci/pipeline.yml | 66 +++-- 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 8cfb411..df78a79 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -1355,17 +1355,9 @@ resources: ignore_paths: [] paths: - ci/* -uri: https://github.com/apache/geode-native.git +uri: https://github.com/apache/geode-dotnet-core-client.git type: git - icon: docker - name: clang-tools-image - source: -password: ((concourse-gcp-key)) -repository: gcr.io/apachegeode-ci/geode-native-clang-tools -tag: latest -username: _json_key - type: docker-image -- icon: docker name: gcloud-image source: password: ((concourse-gcp-key)) @@ -1382,62 +1374,20 @@ resources: url: https://maven.apachegeode-ci.info/snapshots version: 1\.15\.0-build\..* type: maven-resource -- icon: google-cloud - name: geode-native-develop-build-rhel-7-gci - source: -family: geode-native-develop-build-rhel-7 -family_project: apachegeode-ci -key: ((concourse-gcp-key)) - type: gci-resource -- icon: google-cloud - name: geode-native-develop-build-rhel-8-gci - source: -family: geode-native-develop-build-rhel-8 -family_project: apachegeode-ci -key: ((concourse-gcp-key)) - type: gci-resource -- icon: google-cloud - name: geode-native-develop-build-ubuntu-16-04-gci - source: -family: geode-native-develop-build-ubuntu-16-04 -family_project: apachegeode-ci -key: ((concourse-gcp-key)) - type: gci-resource -- icon: google-cloud - name: geode-native-develop-build-ubuntu-18-04-gci - source: -family: geode-native-develop-build-ubuntu-18-04 -family_project: apachegeode-ci -key: ((concourse-gcp-key)) - type: gci-resource -- icon: google-cloud - name: geode-native-develop-build-ubuntu-20-04-gci - source: -family: geode-native-develop-build-ubuntu-20-04 -family_project: apachegeode-ci -key: ((concourse-gcp-key)) - type: gci-resource -- icon: google-cloud - name: geode-native-develop-build-windows-2016-vs-2017-gci - source: -family: geode-native-develop-build-windows-2016-vs-2017 -family_project: apachegeode-ci -key: ((concourse-gcp-key)) - type: gci-resource -- icon: google-cloud - name: geode-native-develop-build-windows-2019-vs-2019-gci +- icon: archive + name: geode-native-latest source: -family: geode-native-develop-build-windows-2019-vs-2019 -family_project: apachegeode-ci -key: ((concourse-gcp-key)) - type: gci-resource +artifact: org.apache.geode:apache-geode-native:tgz +url: https://apachegeode-ci-concourse/geode-native/geode-native-develop/packages/windows-2019-vs-2019/debug/apache-geode-native-1.14.0-build.1-Windows-64bit.zip +version: 1\.14\.1-build\..* + type: gcs-resource - check_every: 1m icon: github name: source source: access_token: ((github-pr-access-token)) base_branch: develop -repository: apache/geode-native +repository: apache/geode-dotnet-core-client type: github-pr-resource - icon: docker name: task-image
[geode-dotnet-core-client] 05/05: Minimal pipeline
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch GEODE-9356-create-ci
in repository https://gitbox.apache.org/repos/asf/geode-dotnet-core-client.git
commit ee52add8b994566496e938c699bf462efa51d650
Author: Mike Martell
AuthorDate: Mon Jun 14 15:29:35 2021 -0700
Minimal pipeline
---
ci/pipeline.yml | 1076 +++
1 file changed, 51 insertions(+), 1025 deletions(-)
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index bd73f64..04c3f86 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -1,1036 +1,62 @@
-groups:
-- jobs:
- - build-windows-net5-debug
- - check-source
- name: builds
-- jobs:
- - update-pipeline
- name: meta
-- jobs:
- - update-pipeline
- - build-windows-net5-debug
- - check-source
- name: all
-jobs:
-- name: build-windows-net5-debug
- plan:
- - in_parallel:
- fail_fast: true
- steps:
- - get: version
- - get: source
-on_success:
- try:
-attempts: 5
-get_params:
- skip_download: true
-params:
- context: build-windows-2019-vs-2019-debug
- description: null
- path: source
- status: pending
-put: pr-status-pending
-resource: source
-trigger: true
-version: every
- - get: task-image
- - config:
- inputs:
- - name: source
- platform: linux
- run:
-args:
-- -c
-- |-
- # Cribbed shamelessly from geode/ci/scripts/shared_utilities.sh
- is_source_from_pr_testable() {
-if [[ $# -ne 3 ]]; then
- >&2 echo "Invalid args. Try ${0} \"\" \"\""
- exit 1
-fi
-local repo_dir="${1}"
-if [[ ! -d "${repo_dir}" ]]; then
- # If the repo_dir does not exist, assume call from non-PR
- return 0;
-fi
-
-pushd "${repo_dir}" 2>&1 >> /dev/null
- local base_dir=$(git rev-parse --show-toplevel)
- local github_pr_dir="${base_dir}/.git/resource"
- pushd ${base_dir} 2>&1 >> /dev/null
-local return_code=0
-if [ -d "${github_pr_dir}" ]; then
- # Modify this path list with directories to exclude
- local exclude_dirs="${2}"
- for d in $(echo ${exclude_dirs}); do
-local exclude_pathspec="${exclude_pathspec}
:(exclude,glob)${d}/**"
- done
- local exclude_files="${3}"
- for f in "${exclude_files}"; do
-local exclude_pathspec="${exclude_pathspec}
:(exclude,glob)${f}"
- done
- pushd ${base_dir} &> /dev/null
-local files=$(git diff --name-only $(cat
"${github_pr_dir}/base_sha") $(cat "${github_pr_dir}/head_sha") -- . $(echo
${exclude_pathspec}))
- popd &> /dev/null
- if [[ -z "${files}" ]]; then
->&2 echo "Code changes are from CI only"
-return_code=1
- else
->&2 echo "real code change here!"
- fi
-else
- >&2 echo "repo is not from a PR"
-fi
- popd 2>&1 >> /dev/null
-popd 2>&1 >> /dev/null
-return ${return_code}
- }
-
- exclude_dirs="ci packer docker tools"
- exclude_files="*/*.md"
- is_source_from_pr_testable "source" "${exclude_dirs}"
"${exclude_files}" && exit 0 || exit 1
-path: bash
-image: task-image
-on_failure:
- do:
- - try:
- attempts: 5
- get_params:
-skip_download: true
- params:
-context: build-windows-2019-vs-2019-debug
-description: Non-code changes are not compiled.
-path: source
-status: success
- put: pr-status-success
- resource: source
-task: is-source-change
- - do:
-- do:
- - in_parallel:
- fail_fast: true
- steps:
- - get: gcloud-image
- - get: geode-native-develop-build-windows-2019-vs-2019-gci
- - in_parallel:
- fail_fast: true
- steps:
- - config:
- inputs:
- - name: geode-native-develop-build-windows-2019-vs-2019-gci
-path: image
- outputs:
- - name: instance
- platform: linux
- run:
-args:
-- -c
-- |-
- set -ueo pipefail
- GOOGLE_PROJECT=apachegeode-ci
- GOOGLE_ZONE=us-central1-a
- INSTANCE_USER=build
- INSTANCE_DIR=$(pwd)/instance
-
- if [ ! -d "${INSTANCE_DIR}" ]; then
[geode-dotnet-core-client] branch GEODE-9356-create-ci created (now ee52add)
This is an automated email from the ASF dual-hosted git repository. mmartell pushed a change to branch GEODE-9356-create-ci in repository https://gitbox.apache.org/repos/asf/geode-dotnet-core-client.git. at ee52add Minimal pipeline This branch includes the following new commits: new 6feadfa Just windows net5 debug new 5109bf8 Update resources new 74c589b Remove unnecessary tasks new 6b6ac02 Remove C++ source checks new ee52add Minimal pipeline The 5 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.
[geode-dotnet-core-client] 04/05: Remove C++ source checks
This is an automated email from the ASF dual-hosted git repository. mmartell pushed a commit to branch GEODE-9356-create-ci in repository https://gitbox.apache.org/repos/asf/geode-dotnet-core-client.git commit 6b6ac029c5f77e723951cdcf7b5f5d68b40e Author: Mike Martell AuthorDate: Sun Jun 13 15:55:10 2021 -0700 Remove C++ source checks --- ci/pipeline.yml | 34 -- 1 file changed, 34 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index b4a94ef..bd73f64 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -627,45 +627,11 @@ jobs: - in_parallel: fail_fast: true steps: - - get: clang-tools-image - get: version - get: source on_success: in_parallel: steps: -- try: -attempts: 5 -get_params: - skip_download: true -params: - context: clang-format - description: null - path: source - status: pending -put: pr-status-pending -resource: source -- try: -attempts: 5 -get_params: - skip_download: true -params: - context: clang-tidy - description: null - path: source - status: pending -put: pr-status-pending -resource: source -- try: -attempts: 5 -get_params: - skip_download: true -params: - context: rat-check - description: null - path: source - status: pending -put: pr-status-pending -resource: source trigger: true version: every - do:
[geode-dotnet-core-client] 01/05: Just windows net5 debug
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch GEODE-9356-create-ci
in repository https://gitbox.apache.org/repos/asf/geode-dotnet-core-client.git
commit 6feadfae93c6859acbde8f9b8320f23efb81d89a
Author: Mike Martell
AuthorDate: Sun Jun 13 09:54:08 2021 -0700
Just windows net5 debug
---
ci/pipeline.yml | 1468 +++
1 file changed, 1468 insertions(+)
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
new file mode 100644
index 000..8cfb411
--- /dev/null
+++ b/ci/pipeline.yml
@@ -0,0 +1,1468 @@
+groups:
+- jobs:
+ - build-windows-net5-debug
+ - check-source
+ name: builds
+- jobs:
+ - update-pipeline
+ name: meta
+- jobs:
+ - update-pipeline
+ - build-windows-net5-debug
+ - check-source
+ name: all
+jobs:
+- name: build-windows-net5-debug
+ plan:
+ - in_parallel:
+ fail_fast: true
+ steps:
+ - get: version
+ - get: source
+on_success:
+ try:
+attempts: 5
+get_params:
+ skip_download: true
+params:
+ context: build-windows-2019-vs-2019-debug
+ description: null
+ path: source
+ status: pending
+put: pr-status-pending
+resource: source
+trigger: true
+version: every
+ - get: task-image
+ - config:
+ inputs:
+ - name: source
+ platform: linux
+ run:
+args:
+- -c
+- |-
+ # Cribbed shamelessly from geode/ci/scripts/shared_utilities.sh
+ is_source_from_pr_testable() {
+if [[ $# -ne 3 ]]; then
+ >&2 echo "Invalid args. Try ${0} \"\" \"\""
+ exit 1
+fi
+local repo_dir="${1}"
+if [[ ! -d "${repo_dir}" ]]; then
+ # If the repo_dir does not exist, assume call from non-PR
+ return 0;
+fi
+
+pushd "${repo_dir}" 2>&1 >> /dev/null
+ local base_dir=$(git rev-parse --show-toplevel)
+ local github_pr_dir="${base_dir}/.git/resource"
+ pushd ${base_dir} 2>&1 >> /dev/null
+local return_code=0
+if [ -d "${github_pr_dir}" ]; then
+ # Modify this path list with directories to exclude
+ local exclude_dirs="${2}"
+ for d in $(echo ${exclude_dirs}); do
+local exclude_pathspec="${exclude_pathspec}
:(exclude,glob)${d}/**"
+ done
+ local exclude_files="${3}"
+ for f in "${exclude_files}"; do
+local exclude_pathspec="${exclude_pathspec}
:(exclude,glob)${f}"
+ done
+ pushd ${base_dir} &> /dev/null
+local files=$(git diff --name-only $(cat
"${github_pr_dir}/base_sha") $(cat "${github_pr_dir}/head_sha") -- . $(echo
${exclude_pathspec}))
+ popd &> /dev/null
+ if [[ -z "${files}" ]]; then
+>&2 echo "Code changes are from CI only"
+return_code=1
+ else
+>&2 echo "real code change here!"
+ fi
+else
+ >&2 echo "repo is not from a PR"
+fi
+ popd 2>&1 >> /dev/null
+popd 2>&1 >> /dev/null
+return ${return_code}
+ }
+
+ exclude_dirs="ci packer docker tools"
+ exclude_files="*/*.md"
+ is_source_from_pr_testable "source" "${exclude_dirs}"
"${exclude_files}" && exit 0 || exit 1
+path: bash
+image: task-image
+on_failure:
+ do:
+ - try:
+ attempts: 5
+ get_params:
+skip_download: true
+ params:
+context: build-windows-2019-vs-2019-debug
+description: Non-code changes are not compiled.
+path: source
+status: success
+ put: pr-status-success
+ resource: source
+task: is-source-change
+ - do:
+- do:
+ - in_parallel:
+ fail_fast: true
+ steps:
+ - get: gcloud-image
+ - get: geode-native-develop-build-windows-2019-vs-2019-gci
+ - in_parallel:
+ fail_fast: true
+ steps:
+ - config:
+ inputs:
+ - name: geode-native-develop-build-windows-2019-vs-2019-gci
+path: image
+ outputs:
+ - name: instance
+ platform: linux
+ run:
+args:
+- -c
+- |-
+ set -ueo pipefail
+ GOOGLE_PROJECT=apachegeode-ci
+ GOOGLE_ZONE=us-central1-a
+ INSTANCE_USER=build
+ INSTANCE_DIR=$(pwd)/instance
+
+ if [ ! -d "${INSTANCE_DIR}" ]; then
+
[geode-dotnet-core-client] 03/05: Remove unnecessary tasks
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch GEODE-9356-create-ci
in repository https://gitbox.apache.org/repos/asf/geode-dotnet-core-client.git
commit 74c589be5428fed24688f392afe87dd9e1bbfb98
Author: Mike Martell
AuthorDate: Sun Jun 13 15:43:48 2021 -0700
Remove unnecessary tasks
---
ci/pipeline.yml | 350 +---
1 file changed, 1 insertion(+), 349 deletions(-)
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index df78a79..b4a94ef 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -473,359 +473,11 @@ jobs:
function remote_upload {
scp ${SSH_OPTIONS} -i ${ssh_key_file} -q -r "$1"
"${INSTANCE_USER}@${external_ip}:${2}"
}
-remote_shell cmake -E chdir build/cppcache/test ctest -C
${CMAKE_CONFIG} -j8 --timeout=300 --output-on-failure --repeat until-pass:4
--schedule-random
- path: bash
- image: task-image
- task: cpp-unit-tests
- timeout: 30m
-- config:
-inputs:
-- name: instance
-params:
- CMAKE_BUILD_FLAGS: /m
- CMAKE_CONFIG: Debug
- CMAKE_CONFIGURE_FLAGS: -A x64 -Tv141,version=14.16,host=x64
-DCMAKE_SYSTEM_VERSION=10.0.16299.0
- CPACK_GENERATORS: ZIP
-platform: linux
-run:
- args:
- - -c
- - |-
-set -ueo pipefail
-INSTANCE_USER=build
-INSTANCE_DIR=$(pwd)/instance
-
-if [ ! -d "${INSTANCE_DIR}" ]; then
- echo "${INSTANCE_DIR} not found."
- exit 1
-fi
-
-SSH_OPTIONS=${SSH_OPTIONS:-"-o StrictHostKeyChecking=no -o
PasswordAuthentication=no"}
-
-ssh_key_file=${INSTANCE_DIR}/identity
-if [ ! -r "${ssh_key_file}" ]; then
- echo "${ssh_key_file} not readable."
- exit 1
-fi
-
-instance_file=${INSTANCE_DIR}/instance.sh
-if [ ! -r "${instance_file}" ]; then
- echo "${instance_file} not readable."
- exit 1
-fi
-
-external_ip=$(source ${instance_file} && echo -n
${networkInterfaces_accessConfigs_natIP})
-
-function remote_shell {
- ssh ${SSH_OPTIONS} -i ${ssh_key_file}
${INSTANCE_USER}@${external_ip} "$@"
-}
-
-function remote_download {
- scp ${SSH_OPTIONS} -i ${ssh_key_file} -q -r
"${INSTANCE_USER}@${external_ip}:${1}" "$2"
-}
-
-function remote_download_directory {
- ssh ${SSH_OPTIONS} -i ${ssh_key_file}
${INSTANCE_USER}@${external_ip} tar -C $(dirname ${1}) -czf - $(basename ${1})
| tar -C ${2} -zxf -
-}
-
-function remote_upload {
- scp ${SSH_OPTIONS} -i ${ssh_key_file} -q -r "$1"
"${INSTANCE_USER}@${external_ip}:${2}"
-}
-remote_shell cmake -E chdir build/cppcache/integration/test ctest
-C ${CMAKE_CONFIG} -j4 --timeout=300 --output-on-failure --repeat until-pass:4
--schedule-random
- path: bash
- image: task-image
- task: cpp-integration-tests
- timeout: 1h
-- config:
-inputs:
-- name: instance
-params:
- CMAKE_BUILD_FLAGS: /m
- CMAKE_CONFIG: Debug
- CMAKE_CONFIGURE_FLAGS: -A x64 -Tv141,version=14.16,host=x64
-DCMAKE_SYSTEM_VERSION=10.0.16299.0
- CPACK_GENERATORS: ZIP
-platform: linux
-run:
- args:
- - -c
- - |-
-set -ueo pipefail
-INSTANCE_USER=build
-INSTANCE_DIR=$(pwd)/instance
-
-if [ ! -d "${INSTANCE_DIR}" ]; then
- echo "${INSTANCE_DIR} not found."
- exit 1
-fi
-
-SSH_OPTIONS=${SSH_OPTIONS:-"-o StrictHostKeyChecking=no -o
PasswordAuthentication=no"}
-
-ssh_key_file=${INSTANCE_DIR}/identity
-if [ ! -r "${ssh_key_file}" ]; then
- echo "${ssh_key_file} not readable."
- exit 1
-fi
-
-instance_file=${INSTANCE_DIR}/instance.sh
-if [ ! -r "${instance_file}" ]; then
- echo "${instance_file} not readable."
- exit 1
-fi
-
-external_ip=$(source ${instance_file} && echo -n
${networkInterfaces_accessConfigs_natIP})
-
-function remote_shell {
- ssh ${SSH_OPTIONS} -i ${ssh_key_file}
${INSTANCE_USER}@${external_ip} "$@"
-}
-
-function remote_download {
- scp ${SSH_OPTIONS} -i ${ssh_key_file} -q -r
"${INSTANCE_USER}@${external_ip}:${1}" "$2"
-}
-
-function remote_download_directory {
- ssh ${SSH_OPTIONS} -i ${ssh_key_file}
${INSTANCE_USER}@${external_ip} tar -C $(dirname ${1}) -czf - $(basename ${1})
| tar -C ${2} -zxf -
-}
-
-function
[geode] branch develop updated (5936e4f -> f0e6e0d)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 5936e4f GEODE-9373: add testEventIdOutOfOrderInPartitionRegionSingleHopFromCl… (#6609) add f0e6e0d GEODE-9372: Added createSenderTime and createSenderInProgress stats (#6608) No new revisions were added by this update. Summary of changes: .../apache/geode/distributed/internal/DMStats.java | 3 ++- .../distributed/internal/DistributionStats.java| 23 +- .../internal/LonerDistributionManager.java | 7 ++- .../apache/geode/internal/tcp/ConnectionTable.java | 6 -- .../internal/DistributionStatsTest.java| 16 --- 5 files changed, 47 insertions(+), 8 deletions(-)
[geode] branch develop updated (d360405 -> 5936e4f)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d360405 Adds some queue and map JMH benchmarks. (#6540) add 5936e4f GEODE-9373: add testEventIdOutOfOrderInPartitionRegionSingleHopFromCl… (#6609) No new revisions were added by this update. Summary of changes: .../cache/PutAllClientServerDistributedTest.java | 103 + 1 file changed, 103 insertions(+)
[geode] branch support/1.14 updated: GEODE-9289: Configuration compatibile with pre-1.12.0 versions.
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 86b8d21 GEODE-9289: Configuration compatibile with pre-1.12.0
versions.
86b8d21 is described below
commit 86b8d21e26c1b6bcf5680b5a1e335da28284b9c4
Author: Nabarun Nag
AuthorDate: Tue Jun 8 16:45:27 2021 -0700
GEODE-9289: Configuration compatibile with pre-1.12.0 versions.
* This part of the commit was missed as a part of the original
commit
(cherry picked from commit c1e59b23a89d4eac89334f525cd4a8bfaebefe1d)
---
.../codeAnalysis/sanctionedDataSerializables.txt | 4 ++-
.../configuration/domain/Configuration.java| 31 --
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index eea3b02..d6c3d68 100644
---
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1978,9 +1978,11 @@
org/apache/geode/management/internal/ManagerStartupMessage,2
fromData,17
toData,17
-org/apache/geode/management/internal/configuration/domain/Configuration,2
+org/apache/geode/management/internal/configuration/domain/Configuration,4
fromData,112
+fromDataPre_GEODE_1_12_0_0,71
toData,82
+toDataPre_GEODE_1_12_0_0,63
org/apache/geode/management/internal/configuration/domain/ConfigurationChangeResult,2
fromData,31
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
index b18c68e..dd107ac 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/Configuration.java
@@ -37,8 +37,8 @@ import javax.xml.transform.TransformerException;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
+import org.apache.geode.internal.VersionedDataSerializable;
import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.internal.serialization.Version;
import org.apache.geode.internal.serialization.Versioning;
@@ -50,7 +50,7 @@ import
org.apache.geode.management.internal.configuration.utils.XmlUtils;
* Domain object for all the configuration related data.
*
*/
-public class Configuration implements DataSerializable {
+public class Configuration implements VersionedDataSerializable {
private static final long serialVersionUID = 1L;
private String configName;
private String cacheXmlContent;
@@ -159,6 +159,16 @@ public class Configuration implements DataSerializable {
return deployments.keySet();
}
+ public void toDataPre_GEODE_1_12_0_0(DataOutput out) throws IOException {
+DataSerializer.writeString(configName, out);
+DataSerializer.writeString(cacheXmlFileName, out);
+DataSerializer.writeString(cacheXmlContent, out);
+DataSerializer.writeString(propertiesFileName, out);
+DataSerializer.writeProperties(gemfireProperties, out);
+HashSet jarNames = new HashSet<>(deployments.keySet());
+DataSerializer.writeHashSet(jarNames, out);
+ }
+
@Override
public void toData(DataOutput out) throws IOException {
DataSerializer.writeString(configName, out);
@@ -175,6 +185,19 @@ public class Configuration implements DataSerializable {
DataSerializer.writeHashMap(deployments, out);
}
+ public void fromDataPre_GEODE_1_12_0_0(DataInput in) throws IOException,
ClassNotFoundException {
+this.configName = DataSerializer.readString(in);
+this.cacheXmlFileName = DataSerializer.readString(in);
+this.cacheXmlContent = DataSerializer.readString(in);
+this.propertiesFileName = DataSerializer.readString(in);
+this.gemfireProperties = DataSerializer.readProperties(in);
+HashSet jarNames = DataSerializer.readHashSet(in);
+jarNames.stream()
+.map(x -> new Deployment(x, null, null))
+.forEach(deployment -> deployments.put(deployment.getFileName(),
+deployment));
+ }
+
@Override
public void fromData(DataInput in) throws IOException,
ClassNotFoundException {
configName = DataSerializer.readString(in);
@@ -235,4 +258,8 @@ public class Configuration implements DataSerializable {
gemfireProperties, deployments);
}
+ @Override
+ public KnownVersion[] getSerializationVersions() {
+
