Skip to content

(#22608) Accept pson file backups#1919

Merged
jpartlow merged 1 commit intopuppetlabs:stablefrom
joshcooper:ticket/stable/22608-accept-pson-file-backups
Sep 19, 2013
Merged

(#22608) Accept pson file backups#1919
jpartlow merged 1 commit intopuppetlabs:stablefrom
joshcooper:ticket/stable/22608-accept-pson-file-backups

Conversation

@joshcooper
Copy link
Contributor

Commit 769dcdf for #22375 removed the ability for newer masters to accept pson encoded file backups from older agents.

This commit ensures that masters can deserialize s or pson encoded file backups, while agents will serialize using s by default.

@puppetcla
Copy link

CLA signed by all contributors.

Copy link
Contributor

Choose a reason for hiding this comment

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

@joshcooper I read the comment below, and I think I understand how pson is broken, but I'm confused by the pending message. When would this test pass if pson is deprecated and slated for removal?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jpartlow I wanted to ensure we had a test that pson round-tripping is broken, but now that I think about it, I removed the to_pson method earlier (because we never want the agent to send it as pson), then the master needs to be prepared to accept it. Let me rework this PR.

Commit 769dcdf for #22375 removed the ability for newer masters to
accept pson encoded file backups from older agents.

This commit ensures that masters can deserialize `s` or `pson` encoded file
backups, while agents will serialize using `s` by default.

It also restores the ability to serialize to pson, but adds a
deprecation warning if that happens. Since pson is not the
`default_format` the agent will never serialize file bucket files to
pson.
jpartlow added a commit that referenced this pull request Sep 19, 2013
…son-file-backups

(#22608) Accept pson file backups
@jpartlow jpartlow merged commit d7e1ee3 into puppetlabs:stable Sep 19, 2013
@joshcooper joshcooper deleted the ticket/stable/22608-accept-pson-file-backups branch August 14, 2018 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants