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.

Sign up for GitHub

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

Jump to bottom

MDEV-13549 Fix and re-enable MTR test galera.MW-284 #675

Merged
merged 1 commit into from
Apr 5, 2018
Merged

MDEV-13549 Fix and re-enable MTR test galera.MW-284 #675

merged 1 commit into from
Apr 5, 2018

Conversation

sciascid
Copy link
Contributor

Failed due to missing RESET MASTER

@sciascid
Copy link
Contributor Author

The changes in this pull request are contributed under the BSD-new license.

@svoj svoj added this to the 10.1 milestone Mar 29, 2018
@janlindstrom
Copy link
Contributor

This does not seem to work yet.

#0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 #1 0x00007ffff4e38231 in __GI_abort () at abort.c:79 #2 0x00007ffff4e2f9da in __assert_fail_base (fmt=0x7ffff4f82d48 "%s%s%s:%u: %s%sAssertion %s' failed.\n%n", assertion=assertion@entry=0x5555563354ef "0", file=file@entry=0x5555563355d0 "/home/jan/mysql/10.1-galera/sql/protocol.cc", line=line@entry=532, function=function@entry=0x555556335f00 Protocol::end_statement()::__PRETTY_FUNCTION__ "void Protocol::end_statement()") at assert.c:92
#3 0x00007ffff4e2fa52 in __GI___assert_fail (assertion=0x5555563354ef "0", file=0x5555563355d0 "/home/jan/mysql/10.1-galera/sql/protocol.cc", line=532, function=0x555556335f00 Protocol::end_statement()::__PRETTY_FUNCTION__ "void Protocol::end_statement()") at assert.c:101
#4 0x0000555555970bf9 in Protocol::end_statement (this=0x7fffef7a7608) at /home/jan/mysql/10.1-galera/sql/protocol.cc:532
#5 0x0000555555a2518a in do_command (thd=0x7fffef7a7070) at /home/jan/mysql/10.1-galera/sql/sql_parse.cc:1100
#6 0x0000555555b5d950 in do_handle_one_connection (thd_arg=0x7fffef7a7070) at /home/jan/mysql/10.1-galera/sql/sql_connect.cc:1330
#7 0x0000555555b5d6a0 in handle_one_connection (arg=0x7fffef7a7070) at /home/jan/mysql/10.1-galera/sql/sql_connect.cc:1242
#8 0x0000555555f8cc3b in pfs_spawn_thread (arg=0x7fffe643fa70) at /home/jan/mysql/10.1-galera/storage/perfschema/pfs.cc:1861
#9 0x00007ffff7bc15aa in start_thread (arg=0x7fffee7b2b00) at pthread_create.c:463
#10 0x00007ffff4ef8cbf in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95
(gdb) `

janlindstrom
janlindstrom requested changes Apr 5, 2018
View reviewed changes
Copy link
Contributor

@janlindstrom janlindstrom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the assertion.

@sciascid
MDEV-13549 Fix and re-enable MTR test galera.MW-284
45eca61 
The following changes are committed:

* `RESET MASTER` at the end of the test. This was necessary to allow the test
  to run on repeated runs.

* `--source include/galera_wait_ready.inc` after setting `gmcast.isolate=0` to
  get back to a primary component.

* Fix for assertion in `Protocol::end_statement()`. The assertion is due to
  the fact that function `do_command()` calls `thd->protocol->end_statement()`,
  without setting an error, when it is detected that galera is not ready yet.
  Following line somehow disappeared in a past merge:
  ```
  my_message(ER_UNKNOWN_COM_ERROR,
             "WSREP has not yet prepared node for application use", MYF(0));
  ```
@sciascid sciascid force-pushed the MDEV-13549-fixes-for-MW-284 branch from bb69cf9 to 45eca61 Compare April 5, 2018 12:55
@sciascid
Copy link
Contributor Author

sciascid commented Apr 5, 2018

@janlindstrom thanks for catching this assertion, for some reason it didn't assert for me previously.
Should be fixed now. Notice that the branch was rebased and force pushed.

@janlindstrom janlindstrom merged commit e2e1483 into MariaDB:10.1 Apr 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janlindstrom janlindstrom janlindstrom requested changes

Assignees

@janlindstrom janlindstrom

Labels
None yet
Milestone
10.1
Development

Successfully merging this pull request may close these issues.
3 participants
@sciascid @janlindstrom @svoj