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

[filesystem] Convert rest of unix to fs2 #1266

Merged
merged 1 commit into from
Oct 10, 2018
Merged

Conversation

jaymzh
Copy link
Collaborator

@jaymzh jaymzh commented Oct 5, 2018

Description

This PR [almost] finishes the implementing support for the "filesystem2"
format for the rest of the platforms that were never converted -
everything except Windows which will be in a follow-up PR.

Here's some other cleanup along hte way:

  • Fix the fact that "allow_partial_data" only worked on Linux. Oops.
  • Add helper for "allow_partial_data" stuff so that "allow_partial_data"
    support was easy to be consistent about
  • Always get all ZFS options, no reason not to provide all data
  • Change the way zfs options are laid out. The existing way separates
    everything into two hashes that need be correlated by the user and
    doesn't seem to make much sense.

Signed-off-by: Phil Dibowitz [email protected]

Check List

@jaymzh jaymzh requested a review from a team October 5, 2018 04:13
context "when 'zfs get' properties are not configured" do
it "collects all filesystem properties" do
expect(plugin).to receive(:shell_out)
context "handles zfs properties" do
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

If someone wants to give me df -Pka and mount output from a Solaris box, I'll write some unittests for that part of the code since whoever wrote this originally never did.

@scotthain - you have access to the internal slowlaris boxes, right?

Choose a reason for hiding this comment

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

@jaymzh here it is in all its glory... https://gist.github.com/scotthain/f03e9fab0e575a137083e0d3f0033a5b

caveats:

  • I redacted some username and servername.chef.internal.dns
  • Both the solaris 10 and 11 machines are zones running on a single solaris 11 host, so you're going to get some weird zone-specific stuff there.

hopefully this helps, I don't have much in the way of bare raw metal anymore :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks, that works. I also need df -na to test that bit too. other tests added.

@jaymzh
Copy link
Collaborator Author

jaymzh commented Oct 5, 2018

I'll look at the windows tests tomorrow...

@jaymzh jaymzh force-pushed the finish_fs2_work branch 2 times, most recently from 6b62a70 to 78d182c Compare October 6, 2018 01:02
appveyor.yml Outdated
@@ -24,7 +24,7 @@ install:
- bundler --version

build_script:
- bundle install
- bundle install || build install || bundle install
Copy link
Contributor

Choose a reason for hiding this comment

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

build install?

This PR [almost] finishes the implementing support for the "filesystem2"
format for the rest of the platforms that were never converted -
everything except Windows which will be in a follow-up PR.

Here's some other cleanup along hte way:
* Fix the fact that "allow_partial_data" only worked on Linux. Oops.
* Add helper for "allow_partial_data" stuff so that "allow_partial_data"
support was easy to be consistent about
* Always get all ZFS options, no reason not to provide all data
* Change the way zfs options are laid out. The existing way separates
everything into two hashes that need be correlated by the user and
doesn't seem to make much sense.

Signed-off-by: Phil Dibowitz <[email protected]>
@jaymzh jaymzh changed the title Finish unification of filesystem plugins; finish fs2 support [filesystem] Convert rest of unix to fs2 Oct 6, 2018
@jaymzh
Copy link
Collaborator Author

jaymzh commented Oct 6, 2018

I dropped the Windows stuff from this PR, I'll push that up in another PR.

jaymzh added a commit to jaymzh/ohai that referenced this pull request Oct 6, 2018
[based on top of chef#1266 - will rebase after that is merged]

Windows doesn't follow quite the same paradigms as Unix, but there's
enough in common that we can still map most things.

The tests don't pass here, yet, and I'm not quite sure why. In some test
logical_properties is returning an array but I don't see how that's
possible. :/

Signed-off-by: Phil Dibowitz <[email protected]>
@jaymzh
Copy link
Collaborator Author

jaymzh commented Oct 9, 2018

@chef/client-core @chef/client-maintainers - this is ready for review.

jaymzh added a commit to jaymzh/ohai that referenced this pull request Oct 10, 2018
[based on top of chef#1266 - will rebase after that is merged]

Windows doesn't follow quite the same paradigms as Unix, but there's
enough in common that we can still map most things.

The tests don't pass here, yet, and I'm not quite sure why. In some test
logical_properties is returning an array but I don't see how that's
possible. :/

Signed-off-by: Phil Dibowitz <[email protected]>
@tas50 tas50 merged commit b4bb7f2 into chef:master Oct 10, 2018
jaymzh added a commit to jaymzh/ohai that referenced this pull request Oct 10, 2018
[based on top of chef#1266 - will rebase after that is merged]

Windows doesn't follow quite the same paradigms as Unix, but there's
enough in common that we can still map most things.

The tests don't pass here, yet, and I'm not quite sure why. In some test
logical_properties is returning an array but I don't see how that's
possible. :/

Signed-off-by: Phil Dibowitz <[email protected]>
jaymzh added a commit to jaymzh/ohai that referenced this pull request Dec 19, 2018
[based on top of chef#1266 - will rebase after that is merged]

Windows doesn't follow quite the same paradigms as Unix, but there's
enough in common that we can still map most things.

The tests don't pass here, yet, and I'm not quite sure why. In some test
logical_properties is returning an array but I don't see how that's
possible. :/

Signed-off-by: Phil Dibowitz <[email protected]>
jaymzh added a commit to jaymzh/ohai that referenced this pull request Dec 19, 2018
[based on top of chef#1266 - will rebase after that is merged]

Windows doesn't follow quite the same paradigms as Unix, but there's
enough in common that we can still map most things.

The tests don't pass here, yet, and I'm not quite sure why. In some test
logical_properties is returning an array but I don't see how that's
possible. :/

Signed-off-by: Phil Dibowitz <[email protected]>
@tas50 tas50 added Expeditor: Bump Version Minor Used by github.minor_bump_labels to bump the Minor version number. and removed Expeditor: Bump Minor Version labels Jan 2, 2019
@lock
Copy link

lock bot commented Jan 24, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Jan 24, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Expeditor: Bump Version Minor Used by github.minor_bump_labels to bump the Minor version number.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants