From: Tomas Sedovic tsedovic@redhat.com
The move to Condor brought us new log files -- one for each new instance. This fix hides them from git. --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore index 0444368..3e3194a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ database.yml development.sqlite3 production.sqlite3 test.sqlite3 + +# Condor log for created instances +src/*.log
From: Jan Provaznik jprovazn@redhat.com
This test tries to create provider which was previously destroyed. It fails for now because frontend hardware profiles are not destroyed when destroing provider. --- src/spec/models/provider_spec.rb | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb index aa61cd5..b15b40c 100644 --- a/src/spec/models/provider_spec.rb +++ b/src/spec/models/provider_spec.rb @@ -72,6 +72,15 @@ describe Provider do @provider.url = "http://invalid.provider/url" @provider.connect.should be_nil end + + it "should allow to recreate provider with same name" do + prov = Factory :mock_provider + prov.save! + prov.populate_hardware_profiles + prov.destroy + prov.save! + prov.populate_hardware_profiles + end end
end
On 07/13/2010 10:57 AM, jprovazn@redhat.com wrote:
From: Jan Provaznikjprovazn@redhat.com
This test tries to create provider which was previously destroyed. It fails for now because frontend hardware profiles are not destroyed when destroing provider.
src/spec/models/provider_spec.rb | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb index aa61cd5..b15b40c 100644 --- a/src/spec/models/provider_spec.rb +++ b/src/spec/models/provider_spec.rb @@ -72,6 +72,15 @@ describe Provider do @provider.url = "http://invalid.provider/url" @provider.connect.should be_nil end
it "should allow to recreate provider with same name" do
prov = Factory :mock_provider
prov.save!
prov.populate_hardware_profiles
prov.destroy
prov.save!
prov.populate_hardware_profiles
end end
end
Sorry, I sent wrong file, please ignore patch above.
From: Jan Provaznik jprovazn@redhat.com
--- src/app/util/condormatic.rb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb index e994504..81cf2b9 100644 --- a/src/app/util/condormatic.rb +++ b/src/app/util/condormatic.rb @@ -24,6 +24,7 @@ def condormatic_instance_create(task) realm = instance.realm rescue nil
job_name = "job_#{instance.name}_#{instance.id}" + job_log = File.join('log', "condor-#{job_name}.log")
# I use the 2>&1 to get stderr and stdout together because popen3 does not support @@ -35,8 +36,8 @@ def condormatic_instance_create(task) Rails.logger.info "executable = #{job_name}\n" pipe.puts "grid_resource = dcloud $$(provider_url) $$(username) $$(password) $$(image_key) #{instance.name} $$(realm_key) $$(hardwareprofile_key)\n" Rails.logger.info "grid_resource = dcloud $$(provider_url) $$(username) $$(password) $$(image_key) #{instance.name} $$(realm_key) $$(hardwareprofile_key)\n" - pipe.puts "log = #{job_name}.log\n" - Rails.logger.info "log = #{job_name}.log\n" + pipe.puts "log = #{job_log}\n" + Rails.logger.info "log = #{job_log}\n"
requirements = "requirements = hardwareprofile == "#{instance.hardware_profile.id}" && image == "#{instance.image.id}"" requirements += " && realm == "#{realm.name}"" if realm != nil
ACK. This is much better solution than my patch.
Thomas
----- Original Message ----- From: jprovazn@redhat.com To: deltacloud-devel@lists.fedorahosted.org Sent: Tuesday, July 13, 2010 11:02:57 AM GMT +01:00 Amsterdam / Berlin / Bern / Rome / Stockholm / Vienna Subject: [deltacloud-devel] [PATCH aggregator] Changed condor logfile location.
From: Jan Provaznik jprovazn@redhat.com
--- src/app/util/condormatic.rb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb index e994504..81cf2b9 100644 --- a/src/app/util/condormatic.rb +++ b/src/app/util/condormatic.rb @@ -24,6 +24,7 @@ def condormatic_instance_create(task) realm = instance.realm rescue nil
job_name = "job_#{instance.name}_#{instance.id}" + job_log = File.join('log', "condor-#{job_name}.log")
# I use the 2>&1 to get stderr and stdout together because popen3 does not support @@ -35,8 +36,8 @@ def condormatic_instance_create(task) Rails.logger.info "executable = #{job_name}\n" pipe.puts "grid_resource = dcloud $$(provider_url) $$(username) $$(password) $$(image_key) #{instance.name} $$(realm_key) $$(hardwareprofile_key)\n" Rails.logger.info "grid_resource = dcloud $$(provider_url) $$(username) $$(password) $$(image_key) #{instance.name} $$(realm_key) $$(hardwareprofile_key)\n" - pipe.puts "log = #{job_name}.log\n" - Rails.logger.info "log = #{job_name}.log\n" + pipe.puts "log = #{job_log}\n" + Rails.logger.info "log = #{job_log}\n"
requirements = "requirements = hardwareprofile == "#{instance.hardware_profile.id}" && image == "#{instance.image.id}"" requirements += " && realm == "#{realm.name}"" if realm != nil
On 07/09/2010 04:04 PM, tsedovic@redhat.com wrote:
From: Tomas Sedovictsedovic@redhat.com
The move to Condor brought us new log files -- one for each new instance. This fix hides them from git.
.gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore index 0444368..3e3194a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ database.yml development.sqlite3 production.sqlite3 test.sqlite3
+# Condor log for created instances +src/*.log
As it's possible to set log path in app/util/condormatic.rb, we can change path to 'log/' dir. Sending patch to this thread.
Jan
deltacloud-devel@lists.fedorahosted.org