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

nautilus: tools/rados: Unmask '-o' to restore original behaviour #33641

Merged
merged 1 commit into from
Apr 7, 2020
Merged

nautilus: tools/rados: Unmask '-o' to restore original behaviour #33641

merged 1 commit into from
Apr 7, 2020

Conversation

tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Mar 1, 2020 •
edited
Loading

@tchaikov tchaikov added this to the nautilus milestone Mar 1, 2020
@badone
Copy link
Contributor

badone commented Mar 1, 2020

jenkins test make check

@badone
Copy link
Contributor

badone commented Mar 1, 2020 

The following tests FAILED:
	  7 - run-tox-mgr-ansible (Failed)
	  8 - run-tox-mgr-orchestrator_cli (Failed)

`Traceback:
test_orchestrator.py:5: in <module>
    from orchestrator import DriveGroupSpec, DeviceSelection, DriveGroupValidationError, \
../orchestrator.py:15: in <module>
    from mgr_module import MgrModule, PersistentStoreDict
../mgr_module.py:13: in <module>
    import rados
E   ImportError: No module named rados`

@tchaikov
Copy link
Contributor Author

tchaikov commented Mar 2, 2020

jenkins test make check

i cannot reproduce this failure locally.

@tchaikov
Copy link
Contributor Author

tchaikov commented Mar 2, 2020

jenkins test make check

@badone
Copy link
Contributor

badone commented Mar 2, 2020

I can reproduce on latest bionic container image. Looking into it further.

@badone
Copy link
Contributor

badone commented Mar 2, 2020

Looks like multiple Nautilus PRs are hitting this issue. I'm trying to bisect it but I have no reason it's related to this code.

runsisi
runsisi reviewed Mar 2, 2020
View reviewed changes
PendingReleaseNotes Outdated

* The behaviour of the ``-o`` argument to the rados tool has been reverted to
its orignal behaviour of indicating an output file. This reverts it to a more
consisten behaviour when compared to other tools. Specifying obect size is now
Copy link
Contributor

Choose a reason for hiding this comment

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

s/obect/object/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

s/consisten/consistent/

we might want to fix these typos in master first though.

@liewegas
Copy link
Member

liewegas commented Mar 2, 2020

see fb991fa

@badone badone mentioned this pull request Mar 3, 2020
Merged
3 tasks
@smithfarm
Copy link
Contributor

@tchaikov Please rebase. This is targeting 14.2.9 now.

@tchaikov
Copy link
Contributor Author

@smithfarm thanks for the reminder. rebased and pushed.

@smithfarm smithfarm added nautilus-batch-1 nautilus point releases needs-qa and removed needs-rebase labels Mar 20, 2020
@yuriw
Copy link
Contributor

yuriw commented Mar 23, 2020

@tchaikov pls rebase
Auto-merging qa/tasks/radosbench.py
Auto-merging PendingReleaseNotes
CONFLICT (content): Merge conflict in PendingReleaseNotes
Automatic merge failed; fix conflicts and then commit the result.
Traceback (most recent call last):
File "/home/yuriw/wip_master/src/script/build-integration-branch", line 100, in
assert not r
AssertionError

@badone @tchaikov
tools/rados: Unmask '-o' to restore original behaviour
2b36777 
0b369e1 masked the original behaviour of '-o' which was to indicate
'outfile' as documented in the man page. Changing object-size to capital
o will restore the original behaviour.

Fixes: https://tracker.ceph.com/issues/42477

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit d2b8060)

Conflicts:
	PendingReleaseNotes: trivial resolution
@tchaikov
Copy link
Contributor Author

@yuriw rebased

@smithfarm
Copy link
Contributor

jenkins test make check

@yuriw
Copy link
Contributor

yuriw commented Apr 1, 2020

wip-yuri-testing-2020-04-01-2252-nautilu

@yuriw yuriw merged commit a6cd5a9 into ceph:nautilus Apr 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@runsisi runsisi runsisi left review comments

@badone badone badone approved these changes

@neha-ojha neha-ojha Awaiting requested review from neha-ojha

Assignees
No one assigned
Labels
nautilus-batch-1 nautilus point releases needs-qa tools wip-yuri-testing
Projects
None yet
Milestone
nautilus
Development

Successfully merging this pull request may close these issues.
6 participants
@tchaikov @badone @liewegas @smithfarm @yuriw @runsisi