From 2b5ca869298286012d2552c10ffb7714b5627a2a Mon Sep 17 00:00:00 2001 From: donghee yang Date: Thu, 11 Apr 2013 15:07:41 +0900 Subject: [PATCH] Revert "[Title] Fixed a bug that processing same jobs redundently" This reverts commit d43999c6c9f25de6c17b914776dcca90e5284290 --- src/build_server/BuildJob.rb | 25 -------------- src/build_server/GitBuildJob.rb | 34 ------------------- src/build_server/JobManager.rb | 26 -------------- src/build_server/MultiBuildJob.rb | 5 --- src/build_server/RegisterPackageJob.rb | 27 --------------- .../build-server.basic1/build-cli-36.testcase | 13 ------- test/build-server.basic1/testsuite | 1 - 7 files changed, 131 deletions(-) delete mode 100644 test/build-server.basic1/build-cli-36.testcase diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb index 7985461..b30c75f 100644 --- a/src/build_server/BuildJob.rb +++ b/src/build_server/BuildJob.rb @@ -260,31 +260,6 @@ class BuildJob < CommonJob end - def is_same_with?(wjob) - # must have same distribution - if get_distribution_name() != wjob.get_distribution_name() then - return false - end - - if @type != wjob.type then return false end - - prj1 = get_project() - prj2 = wjob.get_project() - - # check project name - if prj1.nil? or prj2.nil? or - prj1.name != prj2.name then - return false - end - - # check version - if @pkginfo.nil? or wjob.pkginfo.nil? or - not(Version.new(@pkginfo.get_version()) == Version.new(wjob.pkginfo.get_version())) then - return false - end - end - - def is_compatible_with?(o) # must have same distribution if get_distribution_name() != o.get_distribution_name() then diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb index 715f3a8..b68d60b 100644 --- a/src/build_server/GitBuildJob.rb +++ b/src/build_server/GitBuildJob.rb @@ -204,40 +204,6 @@ class GitBuildJob < BuildJob end - def is_same_with?(wjob) - # must have same distribution - if get_distribution_name() != wjob.get_distribution_name() then - return false - end - if @type != wjob.type then return false end - - prj1 = @project - prj2 = wjob.get_project() - - # check project name - if prj1.nil? or prj2.nil? or - prj1.name != prj2.name then - return false - end - - # check version - if @pkginfo.nil? or wjob.pkginfo.nil? or - not(Version.new(@pkginfo.get_version()) == Version.new(wjob.pkginfo.get_version())) then - return false - end - - if @git_commit != wjob.git_commit then return false end - - # check compat os - wjob.pkginfo.get_target_packages(wjob.os).each do |p| - if not p.os_list.include?(@os) then return false end - end - - - return true - end - - # # PROTECTED/PRIVATE METHODS # diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb index 8fe82bf..5bfbf40 100644 --- a/src/build_server/JobManager.rb +++ b/src/build_server/JobManager.rb @@ -312,9 +312,6 @@ class JobManager end end - # remove duplicated jobs - remove_duplicated_jobs() - # reverse build job -> internal job -> normal job job = get_available_job @@ -347,29 +344,6 @@ class JobManager @reverse_build_jobs.delete_if {|j| j.id == job.id} end - - # will remove redundent jobs - def remove_duplicated_jobs() - @jobs.reverse.each do |j1| - if j1.status != "WAITING" then next end - - @jobs.each do |j2| - if j1.id == j2.id then next end - if j2.status != "WAITING" and j2.status != "WORKING" and - j2.status != "REMOTE_WORKING" then - next - end - - if j1.is_same_with?(j2) then - j1.log.error("There already exists same job. (#{j2.id})", Log::LV_USER) - j1.status = "ERROR" - break - end - end - end - end - - # select the job whith no build-dependency problem def get_available_job # select reverse build job with round-robin method diff --git a/src/build_server/MultiBuildJob.rb b/src/build_server/MultiBuildJob.rb index 89e2020..7076642 100644 --- a/src/build_server/MultiBuildJob.rb +++ b/src/build_server/MultiBuildJob.rb @@ -252,11 +252,6 @@ class MultiBuildJob < CommonJob end - def is_same_with?(o) - return false - end - - def is_compatible_with?(o) return false end diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb index 1b149be..3948901 100644 --- a/src/build_server/RegisterPackageJob.rb +++ b/src/build_server/RegisterPackageJob.rb @@ -261,33 +261,6 @@ class RegisterPackageJob < CommonJob end - def is_same_with?(wjob) - # must have same distribution - if get_distribution_name() != wjob.get_distribution_name() then - return false - end - - if @type != wjob.type then return false end - - case @pkg_type - when "BINARY" - pkg_name = @pkginfo.packages[0].name - pkg_ - @pkginfo.packages[0].os_list - if @pkgin_name == wjob.pkg_name and - @pkg_version == wjob.pkg_version and - wjob.pkginfo.packages.count == 1 and - wjob.pkginfo.packages[0].os_list.include?(@os) then - return true - end - when "ARCHIVE" - if @pkg_name == wjob.pkg_name then return true end - end - - return false - end - - def is_compatible_with?(o) return false end diff --git a/test/build-server.basic1/build-cli-36.testcase b/test/build-server.basic1/build-cli-36.testcase deleted file mode 100644 index 7b13cdb..0000000 --- a/test/build-server.basic1/build-cli-36.testcase +++ /dev/null @@ -1,13 +0,0 @@ -#PRE-EXEC -echo "This case will check redundent job" -../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 --rebuild & -#EXEC -sleep 2 -../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 --rebuild -#POST-EXEC -#EXPECT -Info: Added new job -Info: Initializing job... -Info: Checking package version ... -Error: There already exists same job. -Error: Building job on remote server failed! diff --git a/test/build-server.basic1/testsuite b/test/build-server.basic1/testsuite index cfbf416..282784b 100644 --- a/test/build-server.basic1/testsuite +++ b/test/build-server.basic1/testsuite @@ -33,4 +33,3 @@ build-cli-32.testcase build-cli-33.testcase build-cli-34.testcase build-cli-35.testcase -build-cli-36.testcase -- 2.34.1