Change in asterixdb[master]: Adding docker support for writing replication ITs
Akshay Manchale has posted comments on this change. Change subject: Adding docker support for writing replication ITs .. Patch Set 5: (5 comments) https://asterix-gerrit.ics.uci.edu/#/c/1644/3/asterixdb/asterix-installer/pom.xml File asterixdb/asterix-installer/pom.xml: PS3, Line 309: > tabs? Done https://asterix-gerrit.ics.uci.edu/#/c/1644/3/asterixdb/asterix-installer/src/test/resources/docker/Dockerfile File asterixdb/asterix-installer/src/test/resources/docker/Dockerfile: PS3, Line 44: OPY > remove commented code? Done PS3, Line 53: > remove commented code? Done https://asterix-gerrit.ics.uci.edu/#/c/1644/3/asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml File asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml: PS3, Line 21: asterix > This is not related to the Vagrant software, is it? Done PS3, Line 76: > What is this 'q' good for? Done -- To view, visit https://asterix-gerrit.ics.uci.edu/1644 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Akshay Manchale Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Adding docker support for writing replication ITs
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1644 to look at the new patch set (#4). Change subject: Adding docker support for writing replication ITs .. Adding docker support for writing replication ITs Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf --- M asterixdb/asterix-installer/pom.xml A asterixdb/asterix-installer/src/test/resources/docker/Dockerfile A asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml A asterixdb/asterix-installer/src/test/resources/docker/docker-compose.yml A asterixdb/asterix-installer/src/test/resources/docker/id_rsa A asterixdb/asterix-installer/src/test/resources/docker/id_rsa.pub 6 files changed, 276 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/1644/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/1644 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Adding docker support for writing replication ITs
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1644 to look at the new patch set (#3). Change subject: Adding docker support for writing replication ITs .. Adding docker support for writing replication ITs Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf --- M asterixdb/asterix-installer/pom.xml A asterixdb/asterix-installer/src/test/resources/docker/Dockerfile A asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml A asterixdb/asterix-installer/src/test/resources/docker/docker-compose.yml A asterixdb/asterix-installer/src/test/resources/docker/id_rsa A asterixdb/asterix-installer/src/test/resources/docker/id_rsa.pub 6 files changed, 285 insertions(+), 1 deletion(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/1644/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1644 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail
Change in asterixdb[master]: Adding docker support for writing replication ITs
Akshay Manchale has uploaded a new patch set (#2). Change subject: Adding docker support for writing replication ITs .. Adding docker support for writing replication ITs Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf --- A asterixdb/asterix-installer/src/test/resources/docker/Dockerfile A asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml A asterixdb/asterix-installer/src/test/resources/docker/docker-compose.yml A asterixdb/asterix-installer/src/test/resources/docker/id_rsa A asterixdb/asterix-installer/src/test/resources/docker/id_rsa.pub 5 files changed, 282 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/1644/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1644 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Jenkins
Change in asterixdb[master]: PLEASE EDIT to provide a meaningful commit message!
Akshay Manchale has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1644 Change subject: PLEASE EDIT to provide a meaningful commit message! .. PLEASE EDIT to provide a meaningful commit message! The following commits from your working branch will be included: commit d08f206b4849c2885561f0025f6e1eccba75446a Author: Akshay M SDate: Thu Mar 30 18:49:15 2017 -0700 Docker support to write replication integration tests Change-Id: If7948a25f39e1c155ce96502572c1eef122f04bf --- A asterixdb/asterix-installer/src/test/resources/docker/Dockerfile A asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml A asterixdb/asterix-installer/src/test/resources/docker/docker-compose.yml A asterixdb/asterix-installer/src/test/resources/docker/id_rsa A asterixdb/asterix-installer/src/test/resources/docker/id_rsa.pub 5 files changed, 282 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/1644/1 diff --git a/asterixdb/asterix-installer/src/test/resources/docker/Dockerfile b/asterixdb/asterix-installer/src/test/resources/docker/Dockerfile new file mode 100644 index 000..933f1f4 --- /dev/null +++ b/asterixdb/asterix-installer/src/test/resources/docker/Dockerfile @@ -0,0 +1,62 @@ +#/* +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + +FROM centos +MAINTAINER AsterixDB Team + +RUN echo 'LANG="en_US.UTF-8"' > /etc/sysconfig/i18n ;echo 'ZONE="America/Los_Angeles"' > /etc/sysconfig/clock ;cp -a /usr/share/zoneinfo/America/Los_Angeles /etc/localtime +RUN echo "include_only=.us" >> /etc/yum/pluginconf.d/fastestmirror.conf +RUN yum -y update +RUN yum install -y unzip java-1.8.0-openjdk openssh-server openssh-clients python-setuptools wget curl net-tools + +RUN sshd-keygen +RUN sed -i "s/UsePrivilegeSeparation.*/UsePrivilegeSeparation no/g" /etc/ssh/sshd_config +RUN sed -i "s/UsePAM.*/UsePAM no/g" /etc/ssh/sshd_config + +RUN useradd asterix -G wheel -s /bin/bash -m +RUN echo 'asterix:asterix' | chpasswd +RUN echo '%wheel ALL=(ALL) ALL' >> /etc/sudoers +RUN echo 'Host *' >> /etc/ssh/ssh_config +RUN echo 'StrictHostKeyChecking no' >> /etc/ssh/ssh_config + +CMD ["/usr/sbin/sshd", "-D"] + +RUN mkdir /asterixdb +RUN mkdir /asterixdb/asterix +RUN mkdir /asterixdb/data +COPY asterix-installer*.zip . +RUN unzip asterix-installer*.zip -d /asterixdb/asterix-installer/ +#COPY asterix-configuration.xml /asterixdb/asterix-installer/conf/asterix-configuration.xml +COPY id_rsa /root/.ssh/id_rsa +COPY id_rsa.pub /root/.ssh/id_rsa.pub +COPY cluster-config.xml /asterixdb/ + +RUN cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys +RUN chmod 600 /root/.ssh/id_rsa* +RUN chmod 700 /root/.ssh/authorized_keys + +#WORKDIR /asterixdb/bin +ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0 +ENV JAVA_OPTS -Xmx1536m + +#SSH +EXPOSE 22 +#Asterix ports +EXPOSE 19001 19002 19003 50031 15001 +#Replication ports +EXPOSE 2017 2018 2019 2020 2021 2022 1098 1099 diff --git a/asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml b/asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml new file mode 100644 index 000..4e73592 --- /dev/null +++ b/asterixdb/asterix-installer/src/test/resources/docker/cluster-config.xml @@ -0,0 +1,76 @@ + + + + vagrant + + root + + +/asterixdb/asterix/managix-working +false + + + /asterixdb/data/logs/ + /asterixdb/data/tx_logs + /asterixdb/data/p1,/asterixdb/data/p2 + + storage + + /usr/lib/jvm/jre-1.8.0 + nc1 + + +true + + chained_declustering + 2016 + 30 + 2 + + + auto + + + + +cc +172.20.0.2 +172.20.0.2 +1098 +1099 + + + +nc1 +172.20.0.3 + + +nc2 +172.20.0.4 + + +nc3 +172.20.0.5 + + +nc4 +172.20.0.6 + +q diff --git a/asterixdb/asterix-installer/src/test/resources/docker/docker-compose.yml b/asterixdb/asterix-installer/src/test/resources/docker/docker-compose.yml new file mode 100644 index 000..224b0a9 --- /dev/null +++ b/asterixdb/asterix-installer/src/test/resources/docker/docker-compose.yml @@ -0,0
Change in asterixdb[master]: Fixed issues with Replication tests
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1334 to look at the new patch set (#4). Change subject: Fixed issues with Replication tests .. Fixed issues with Replication tests - Changed the way the log reader writes the newValue - Fixed bug with creating recovery plan - Updated ReplicationIT query files Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java R asterixdb/asterix-installer/src/test/resources/integrationts/replication/queries/failback/node_failback/node_failback.10.get.http D asterixdb/asterix-installer/src/test/resources/integrationts/replication/queries/failback/node_failback/node_failback.5.cstate.aql C asterixdb/asterix-installer/src/test/resources/integrationts/replication/queries/failback/node_failback/node_failback.5.get.http M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.5.adm M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java 7 files changed, 274 insertions(+), 44 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/34/1334/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/1334 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Akshay Manchale Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail
Change in asterixdb[master]: Fixed issues with Replication tests
Akshay Manchale has posted comments on this change. Change subject: Fixed issues with Replication tests .. Patch Set 3: There are changes to TestExecutor that breaks integration tests for reasons not related to Recovery. I will update the patch to include fixes for the test case. -- To view, visit https://asterix-gerrit.ics.uci.edu/1334 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Akshay Manchale Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-HasComments: No
Change in asterixdb[master]: Fixed issues with Replication tests
Akshay Manchale has posted comments on this change. Change subject: Fixed issues with Replication tests .. Patch Set 3: (2 comments) https://asterix-gerrit.ics.uci.edu/#/c/1334/3/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java File hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java: Line 92: return (int) Math.ceil(fieldCount / 4.0); > It is because records have 2 bits for each field to represent whether the f Upon further discussion with Ian, I found that the missing/null bytes and the values here are not related. I'm going to change it back to 8. https://asterix-gerrit.ics.uci.edu/#/c/1334/3/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleWriter.java File hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleWriter.java: Line 77: targetBuf[runner++] = (byte) 0xAA; > This initialization follows from how RecordBuilder is building records. See Changing this back to 0 -- To view, visit https://asterix-gerrit.ics.uci.edu/1334 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Akshay Manchale Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-HasComments: Yes
Change in asterixdb[master]: Fixed issues with Replication tests
Akshay Manchale has posted comments on this change. Change subject: Fixed issues with Replication tests .. Patch Set 3: (3 comments) https://asterix-gerrit.ics.uci.edu/#/c/1334/3/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java: Line 215: System.arraycopy(tuple.getFieldData(0), ((SimpleTupleReference) tuple).getTupleStartOff(), buffer.array(), > This downcast per tuple is expensive. You may add getTupleStartOff to the i I tried adding it to the interface but there are almost 20 different implementations of the interface and a lot of them don't have a tupleStartOffset. I could add the method to ITreeIndexTupleReference interface (which SimpleTupleReference implements) where only one of the implementation has no tupleStartOffset and that implementation can possibly an UnsupportedOperationExcpetion or something similar. However, that wouldn't eliminate the need to cast from ITupleReference to ITreeIndexTupleReference. https://asterix-gerrit.ics.uci.edu/#/c/1334/3/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java File hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java: Line 92: return (int) Math.ceil(fieldCount / 4.0); > why 4? It is because records have 2 bits for each field to represent whether the field is null, missing or present. https://asterix-gerrit.ics.uci.edu/#/c/1334/3/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleWriter.java File hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleWriter.java: Line 77: targetBuf[runner++] = (byte) 0xAA; > why change from 0? This initialization follows from how RecordBuilder is building records. See RecordBuilder.init for the new representation that includes a flag per field to differentiate between null and missing values. 0xAA is the default for this new representation. -- To view, visit https://asterix-gerrit.ics.uci.edu/1334 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Akshay Manchale Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail Gerrit-HasComments: Yes
Change in asterixdb[master]: Fixed issues with Replication tests
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1334 to look at the new patch set (#3). Change subject: Fixed issues with Replication tests .. Fixed issues with Replication tests - Changed the way the log reader writes the newValue - Fixed bug with creating recovery plan - Fixed offset calculation Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.5.adm M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleWriter.java 6 files changed, 280 insertions(+), 13 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/34/1334/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1334 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail
Change in asterixdb[master]: Fixed issues with Replication tests
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1334 to look at the new patch set (#2). Change subject: Fixed issues with Replication tests .. Fixed issues with Replication tests - Fixed offset calculation Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.5.adm M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleWriter.java 6 files changed, 279 insertions(+), 12 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/34/1334/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1334 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Akshay ManchaleGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Murtadha Hubail
Change in asterixdb[master]: Fixed issues with Replication tests - Changed the way the lo...
Akshay Manchale has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1334 Change subject: Fixed issues with Replication tests - Changed the way the log reader writes the newValue - Fixed bug with creating recovery plan .. Fixed issues with Replication tests - Changed the way the log reader writes the newValue - Fixed bug with creating recovery plan Change-Id: I204a41311012dc348d4d41ae8bf6ec8554ab3dc3 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm M asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.5.adm M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java 4 files changed, 263 insertions(+), 10 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/34/1334/1 diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java index 306b888..361ac7c 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java @@ -208,12 +208,7 @@ } private void writeTuple(ByteBuffer buffer, ITupleReference tuple, int size) { -if (logSource == LogSource.LOCAL) { -SimpleTupleWriter.INSTANCE.writeTuple(tuple, buffer.array(), buffer.position()); -} else { -//since the tuple is already serialized in remote logs, just copy it from beginning to end. -System.arraycopy(tuple.getFieldData(0), 0, buffer.array(), buffer.position(), size); -} +SimpleTupleWriter.INSTANCE.writeTuple(tuple, buffer.array(), buffer.position()); buffer.position(buffer.position() + size); } diff --git a/asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm b/asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm index 61322c9..2c3c039 100644 --- a/asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm +++ b/asterixdb/asterix-installer/src/test/resources/integrationts/replication/results/failback/node_failback/node_failback.cluster_state.10.adm @@ -1 +1,131 @@ -{"State":"ACTIVE","Metadata_Node":"asterix_nc1","partition_0":"asterix_nc1","partition_1":"asterix_nc1","partition_2":"asterix_nc2","partition_3":"asterix_nc2"} \ No newline at end of file +{ +"cc": { +"configUri": "http://10.10.0.2:19002/admin/cluster/cc/config;, +"statsUri": "http://10.10.0.2:19002/admin/cluster/cc/stats;, +"threadDumpUri": "http://10.10.0.2:19002/admin/cluster/cc/threaddump; +}, +"config": { +"api.port": 19002, +"cluster.partitions": { +"0": "ID:0, Original Node: asterix_nc1, IODevice: 0, Active Node: asterix_nc1", +"1": "ID:1, Original Node: asterix_nc1, IODevice: 1, Active Node: asterix_nc1", +"2": "ID:2, Original Node: asterix_nc2, IODevice: 0, Active Node: asterix_nc2", +"3": "ID:3, Original Node: asterix_nc2, IODevice: 1, Active Node: asterix_nc2" +}, +"compiler.framesize": 131072, +"compiler.groupmemory": 33554432, +"compiler.joinmemory": 33554432, +"compiler.pregelix.home": "~/pregelix", +"compiler.sortmemory": 33554432, +"core.dump.paths": { +"asterix_nc1": "/home/vagrant/asterix/logs//asterix_nc1", +"asterix_nc2": "/home/vagrant/asterix/logs//asterix_nc2" +}, +"feed.central.manager.port": 4500, +"feed.max.threshold.period": 5, +"feed.memory.available.wait.timeout": 10, +"feed.memory.global.budget": 67108864, +"feed.pending.work.threshold": 50, +"feed.port": 19003, +"instance.name": "asterix", +"log.level": "INFO", +"max.wait.active.cluster": 60, +"metadata.callback.port": 0, +"metadata.node": "asterix_nc1", +"metadata.partition": "ID:0, Original Node: asterix_nc1, IODevice: 0, Active Node: asterix_nc1", +"metadata.port": 0, +"metadata.registration.timeout.secs": 60, +"node.partitions": { +"asterix_nc1": [ +"ID:0, Original Node: asterix_nc1, IODevice: 0, Active Node: asterix_nc1", +"ID:1, Original Node: asterix_nc1, IODevice: 1, Active Node: