Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes vttestserver to work with sharded keyspaces #7617

Merged
merged 3 commits into from
Mar 5, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
renamed the file to use underscores instead of camel casing
Signed-off-by: GuptaManan100 <[email protected]>
GuptaManan100 committed Mar 5, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e6daea243fdd5636e340e3f94178c8446cd06c90
2 changes: 1 addition & 1 deletion docker/vttestserver/Dockerfile.mysql57
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
VOLUME /vt/vtdataroot
USER vitess

COPY docker/vttestserver/setupVschemaFolder.sh /vt/setupVschemaFolder.sh
COPY docker/vttestserver/setup_vschema_folder.sh /vt/setup_vschema_folder.sh
COPY docker/vttestserver/run.sh /vt/run.sh

CMD /vt/run.sh "5.7.9-vitess"
2 changes: 1 addition & 1 deletion docker/vttestserver/Dockerfile.mysql80
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
VOLUME /vt/vtdataroot
USER vitess

COPY docker/vttestserver/setupVschemaFolder.sh /vt/setupVschemaFolder.sh
COPY docker/vttestserver/setup_vschema_folder.sh /vt/setup_vschema_folder.sh
COPY docker/vttestserver/run.sh /vt/run.sh

CMD /vt/run.sh "8.0.21-vitess"
2 changes: 1 addition & 1 deletion docker/vttestserver/run.sh
Original file line number Diff line number Diff line change
@@ -15,6 +15,6 @@
# limitations under the License.

# Setup the Vschema Folder
/vt/setupVschemaFolder.sh "$KEYSPACES" "$NUM_SHARDS"
/vt/setup_vschema_folder.sh "$KEYSPACES" "$NUM_SHARDS"
# Run the vttestserver binary
/vt/bin/vttestserver -port "$PORT" -keyspaces "$KEYSPACES" -num_shards "$NUM_SHARDS" -mysql_bind_host "${MYSQL_BIND_HOST:-127.0.0.1}" -mysql_server_version "${MYSQL_SERVER_VERSION:-$1}" -vschema_ddl_authorized_users=% -schema_dir="/vt/schema/"
File renamed without changes.