diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2010-04-12 22:33:32 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | ee0cc07544df334cdc549907b4dca8d8d115b7b7 (patch) | |
| tree | 647930e81adb8b36595d293121b762b26c8b0f87 /lib | |
| parent | 11189fb1fcf8fb410df3c833d20decb2ec7aa8c2 (diff) | |
| download | puppet-ee0cc07544df334cdc549907b4dca8d8d115b7b7.tar.gz puppet-ee0cc07544df334cdc549907b4dca8d8d115b7b7.tar.xz puppet-ee0cc07544df334cdc549907b4dca8d8d115b7b7.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')
| -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 048920458..6aeda0957 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -158,7 +158,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? @@ -506,12 +505,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 e9a193464..f8ed503d8 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -58,14 +58,6 @@ class Puppet::Transaction report.resource_statuses.values.find_all { |status| status.changed }.collect { |status| catalog.resource(status.resource) } 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) |