-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/39300/
-----------------------------------------------------------
(Updated Oct. 14, 2015, 7:38 a.m.)
Review request for mesos and Ben Mahler.
Changes
-------
Fixed a missing but expected `recoverResources` in the middle of 2 other
instances of this pattern.
Bugs: MESOS-3411
https://issues.apache.org/jira/browse/MESOS-3411
Repository: mesos
Description
-------
The following failure was encountered on buildbot:
https://builds.apache.org/job/Mesos/COMPILER=gcc,CONFIGURATION=--verbose,OS=ubuntu:14.04,label_exp=docker%7C%7CHadoop/921/console
```
I1013 09:54:08.882694 29149 master.cpp:5559] Processing TEARDOWN call for
framework 4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-0000 (default) at
[email protected]:57074
I1013 09:54:08.882822 29149 master.cpp:5571] Removing framework
4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-0000 (default) at
[email protected]:57074
../../src/tests/reservation_endpoints_tests.cpp:184: Failure
Mock function called more times than expected - taking default action specified
at:
../../src/tests/mesos.hpp:1518:
Function call: recoverResources(@0x2b1be400cc10
4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-0000, @0x2b1be4018f40
4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-S0, @0x2b1bc22fc390 { cpus(*):2,
mem(*):1024, disk(*):1024, ports(*):[31000-32000] }, @0x2b1bc22fc3d0 40-byte
object <01-00 00-00 1C-2B 00-00 0B-00 00-00 00-00 00-00 00-00 00-00 00-00 00-00
00-00 00-00 00-00 00-00 00-00 80-3F 00-00 00-00>)
Expected: to be called once
Actual: called twice - over-saturated and active
I1013 09:54:08.884042 29149 hierarchical.hpp:599] Deactivated framework
4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-0000
I1013 09:54:08.884371 29149 hierarchical.hpp:1103] Recovered cpus(*):2;
mem(*):1024; disk(*):1024; ports(*):[31000-32000] (total: cpus(*):2;
mem(*):1024; disk(*):1024; ports(*):[31000-32000], allocated: ) on slave
4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-S0 from framework
4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-0000
I1013 09:54:08.884469 29149 hierarchical.hpp:552] Removed framework
4b0845cd-7ce9-4e7a-b5d1-bcf1c413ca39-0000
```
In `ReservationEndpointsTest.AvailableResources`, the test ends with the
framework holding an offer.
The issue is that there is only a `WillOnce` on `recoverResources`, but it
should ignore subsequent calls with `WillRepeatedly`
since resources are expected to recover on framework teardown.
It seems that there is a race in the test teardown logic, but this fix is
applicable regardless.
Diffs (updated)
-----
src/tests/reservation_endpoints_tests.cpp
d41185241ae8f1f4ad4f9e88b7dea6fdac991ae7
Diff: https://reviews.apache.org/r/39300/diff/
Testing
-------
Thanks,
Michael Park
