diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2010-04-12 22:33:32 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-05-02 18:01:24 +1000 |
| commit | 5258a0afccf0563d3000c63e261c201115c31c33 (patch) | |
| tree | f1016e3124eda9250aab8e4134a22243874e421d /lib/puppet | |
| parent | bcde541e4433aa46c9f922b01e34368a09abb7e8 (diff) | |
| download | puppet-5258a0afccf0563d3000c63e261c201115c31c33.tar.gz puppet-5258a0afccf0563d3000c63e261c201115c31c33.tar.xz puppet-5258a0afccf0563d3000c63e261c201115c31c33.zip | |
Fixing #3533 - Removing all transaction cleanup
It's really slow and has no actual functionality
any more, since we just remove the catalogs from memory
anyway.
This should be a good speed boost for very little effort.
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/resource/catalog.rb | 7 | ||||
| -rw-r--r-- | lib/puppet/transaction.rb | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index f49c95540..6f589083c 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -160,7 +160,6 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph ensure @applying = false cleanup() - transaction.cleanup if defined? transaction and transaction end # Are we in the middle of applying the catalog? @@ -508,12 +507,6 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph private def cleanup - unless @transient_resources.empty? - remove_resource(*@transient_resources) - @transient_resources.clear - @relationship_graph = nil - end - # Expire any cached data the resources are keeping. expire() end diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index 028bdb8c8..e5846b1e9 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -152,14 +152,6 @@ class Transaction }.uniq end - # Do any necessary cleanup. If we don't get rid of the graphs, the - # contained resources might never get cleaned up. - def cleanup - if defined? @generated - catalog.remove_resource(*@generated) - end - end - # Copy an important relationships from the parent to the newly-generated # child resource. def make_parent_child_relationship(resource, children) |