Skip to content

Commit ea959cb

Browse files
committed
Counter table fix & docker build info for local docker test.
1 parent 09d6f13 commit ea959cb

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

SIT/environment.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,17 @@ _Setup() {
228228

229229
if [ "$(_testDockerCDM)" != "yes" ]; then
230230
dockerContainerVersion=datastax/cassandra-data-migrator:${CDM_VERSION}
231+
232+
# Uncomment the below 'docker build' lines when making docker changes to ensure you test the docker changes
233+
# Also comment the 'docker pull' line when 'docker build' is uncommented.
234+
# Note this ('docker build') should be done only when testing docker changes locally (i.e. Do not commit)
235+
# If you commit the 'docker build' step, the build will work but it will take too long as each time it will build
236+
# CDM docker image instead of just downloading from DockerHub.
231237
_info "Pulling latest Docker container for ${dockerContainerVersion}"
232238
docker pull ${dockerContainerVersion}
239+
# _info "Building latest Docker container for ${dockerContainerVersion}"
240+
# docker build -t ${dockerContainerVersion} ..
241+
233242
_info "Starting Docker container ${DOCKER_CASS}"
234243
docker run --name ${DOCKER_CDM} --network ${NETWORK_NAME} --ip ${SUBNET}.3 -e "CASS_USERNAME=${CASS_USERNAME}" -e "CASS_PASSWORD=${CASS_PASSWORD}" -e "CASS_CLUSTER=${DOCKER_CASS}" -d ${dockerContainerVersion}
235244
attempt=1

src/main/java/com/datastax/cdm/feature/WritetimeTTL.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ public boolean initializeAndValidate(CqlTable originTable, CqlTable targetTable)
117117
logger.error("Counter table cannot specify TTL or WriteTimestamp columns as they cannot set on write");
118118
isValid = false;
119119
isEnabled = false;
120-
return false;
121120
}
122121

123122
logger.info("Counter table does not support TTL or WriteTimestamp columns as they cannot set on write, so feature is disabled");

0 commit comments

Comments
 (0)