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

tests: ceph-fuse crash in test_client_recovery #5813

Merged
2 commits merged into from Oct 20, 2015

Conversation

Projects
None yet
3 participants
@smithfarm
Contributor

smithfarm commented Sep 4, 2015

ldachary added some commits Aug 13, 2015

osd: trigger the cache agent after a promotion
When a proxy read happens, the object promotion is done in parallel. The
agent_choose_mode function must be called to reconsider the situation
to protect against the following scenario:

  * proxy read
  * agent_choose_mode finds no object exists and the agent
    goes idle
  * object promotion happens
  * the agent does not reconsider and eviction does not happen
    although it should

http://tracker.ceph.com/issues/12673 Fixes: #12673

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit e1f58fe)
tests: tiering agent and proxy read
Verify that an object promoted to a cache tier because of a proxy read
is evicted as expected.

http://tracker.ceph.com/issues/12673 Refs: #12673

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7924231)

Conflicts:
	qa/workunits/cephtool/test.sh
            resolved by manually adding the new test to TESTS

@smithfarm smithfarm self-assigned this Sep 4, 2015

@smithfarm smithfarm added this to the firefly milestone Sep 4, 2015

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 4, 2015

@dachary could you look at the conflict resolution on 2c0d7fe ?

@ghost

This comment has been minimized.

ghost commented Sep 4, 2015

$ commit=2c0d7fe ; picked_from=$(git show --no-patch --pretty=%b $commit  | perl -ne 'print if(s/.*cherry picked from commit (\w+).*/$1/)') ; diff -u --ignore-matching-lines '^[^+-]'   <(git show $picked_from) <(git show $commit)
--- /dev/fd/63  2015-09-04 17:26:58.337060413 +0200
+++ /dev/fd/62  2015-09-04 17:26:58.337060413 +0200
@@ -65,11 +70,11 @@
  function test_tiering()
  {
    # tiering
-@@ -1686,6 +1729,7 @@ MON_TESTS+=" mon_ping"
- MON_TESTS+=" mon_deprecated_commands"
- 
- OSD_TESTS+=" osd_bench"
-+OSD_TESTS+=" tiering_agent"
- 
- MDS_TESTS+=" mds_tell"
- MDS_TESTS+=" mon_mds"
+@@ -900,6 +943,7 @@ set +x
+ TESTS=(
+   mon_injectargs_SI
+   tiering
++  tiering_agent
+   auth
+   mon_misc
+   mon_mds
@ghost

This comment has been minimized.

ghost commented Sep 4, 2015

the actual conflict resolution matches the description

@ghost

This comment has been minimized.

ghost commented Sep 4, 2015

Reviewed-by: Loic Dachary <ldachary@redhat.com>

once the tests pass

ghost pushed a commit that referenced this pull request Oct 20, 2015

Merge pull request #5813: ceph-fuse crash in test_client_recovery
Reviewed-by: Loic Dachary <ldachary@redhat.com>

ghost pushed a commit that referenced this pull request Oct 20, 2015

Loic Dachary
Merge pull request #5813 from SUSE/wip-12822-firefly
ceph-fuse crash in test_client_recovery

Reviewed-by: Loic Dachary <ldachary@redhat.com>

@ghost ghost merged commit 11ed9f9 into ceph:firefly Oct 20, 2015

@smithfarm smithfarm deleted the SUSE:wip-12822-firefly branch Oct 20, 2015

@ghost ghost changed the title from ceph-fuse crash in test_client_recovery to tests: ceph-fuse crash in test_client_recovery Oct 24, 2015

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment