Skip to content

ENT-5562 Changed m_inventory dumping behavior to exclude when values is null (3.12.x feeders)#1751

Merged
nickanderson merged 1 commit intocfengine:masterfrom
craigcomstock:ENT-5562/master
May 5, 2020
Merged

ENT-5562 Changed m_inventory dumping behavior to exclude when values is null (3.12.x feeders)#1751
nickanderson merged 1 commit intocfengine:masterfrom
craigcomstock:ENT-5562/master

Conversation

@craigcomstock
Copy link
Copy Markdown
Contributor

@craigcomstock craigcomstock commented Apr 29, 2020

Previously an empty values column in m_inventory such as when a
host has not reported would cause corrupt SQL to be dumped.
In this case we should simply not include that host in the
output in a similar way that __inventory is built from v_inventory
in latest schema.

Changelog: Title
Ticket: ENT-5562

@craigcomstock craigcomstock added WIP Work in Progress FR Federated Reporting labels Apr 29, 2020
@craigcomstock craigcomstock removed the WIP Work in Progress label May 4, 2020
@craigcomstock craigcomstock changed the title ENT-5562 Added workaround for dumping 3.12.x m_inventory with empty values ENT-5562 Changed m_inventory dumping behavior to exclude when values is null (3.12.x) May 4, 2020
@craigcomstock
Copy link
Copy Markdown
Contributor Author

@cf-bottom jenkins

@craigcomstock craigcomstock requested a review from vpodzime May 4, 2020 18:07
@cf-bottom
Copy link
Copy Markdown

Copy link
Copy Markdown
Contributor

@vpodzime vpodzime left a comment

Choose a reason for hiding this comment

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

Looks good to me. Just please also add a comment about why we cannot use pg_dump for m_inventory.

Previously an empty values column in m_inventory such as when a
host has not reported would cause corrupt SQL to be dumped.
In this case we should simply not include that host in the
output in a similar way that __inventory is built from v_inventory
in latest schema.

Changelog: Title
Ticket: ENT-5562
@craigcomstock
Copy link
Copy Markdown
Contributor Author

Looks good to me. Just please also add a comment about why we cannot use pg_dump for m_inventory.

Ok. Added a comment. Please approve and we can merge.

@nickanderson nickanderson merged commit 820ca85 into cfengine:master May 5, 2020
@nickanderson nickanderson changed the title ENT-5562 Changed m_inventory dumping behavior to exclude when values is null (3.12.x) ENT-5562 Changed m_inventory dumping behavior to exclude when values is null (3.12.x feeders) May 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

FR Federated Reporting

Development

Successfully merging this pull request may close these issues.

4 participants