From: donghee yang <donghee.yang@samsung.com>
Date: Mon, 3 Sep 2012 15:31:07 +0000 (+0900)
Subject: [Title] Fixed the problem of distributing a job within same os servers
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a476358195c1c399d7371a7611ce09bc5f23dece;p=sdk%2Ftools%2Fsdk-build.git

[Title] Fixed the problem of distributing a job within same os servers
---

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index f310502..9ff6e77 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :0.99.32
+Version :0.99.33
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs
diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index 2082560..702014e 100644
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -772,7 +772,7 @@ class BuildJob
 
 		# create builder
 		if @is_remote_job then
-			builder = RemoteBuilder.new("JB#{@id}", @remote_server.ip, @remote_server.port, @server.ftp_addr, @server.ftp_port, @server.ftp_username, @server.ftp_passwd)
+			builder = RemoteBuilder.new("JB#{@id}", @remote_server, @server.ftp_addr, @server.ftp_port, @server.ftp_username, @server.ftp_passwd)
 			@log.info( "JobBuilder##{@id} is created", Log::LV_USER)
 			@log.info( " - Remote Server : #{@remote_server.ip}:#{@remote_server.port}" )
 			@log.info( " - FTP Server : #{@server.ftp_addr}" )
@@ -877,7 +877,7 @@ class BuildJob
 
 		# create builder
 		if @is_remote_job then
-			builder = RemoteBuilder.new("JB#{@id}", @remote_server.ip, @remote_server.port, @server.ftp_addr, @server.ftp_port, @server.ftp_username, @server.ftp_passwd)
+			builder = RemoteBuilder.new("JB#{@id}", @remote_server, @server.ftp_addr, @server.ftp_port, @server.ftp_username, @server.ftp_passwd)
 			@log.info( "JobBuilder##{@id} is created", Log::LV_USER)
 			@log.info( " - Remote Server : #{@remote_server.ip}:#{@remote_server.port}" )
 			@log.info( " - FTP Server : #{@server.ftp_addr}" )
@@ -960,7 +960,7 @@ class BuildJob
 
 		# create builder
 		if @is_remote_job then
-			builder = RemoteBuilder.new("JB#{@id}", @remote_server.ip, @remote_server.port, @server.ftp_addr, @server.ftp_port, @server.ftp_username, @server.ftp_passwd)
+			builder = RemoteBuilder.new("JB#{@id}", @remote_server, @server.ftp_addr, @server.ftp_port, @server.ftp_username, @server.ftp_passwd)
 			@log.info( "JobBuilder##{@id} is created", Log::LV_USER)
 			@log.info( " - Remote Server : #{@remote_server.ip}:#{@remote_server.port}" )
 			@log.info( " - FTP Server : #{@server.ftp_addr}" )
diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index 9de9b93..7098409 100644
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -284,6 +284,7 @@ class BuildServer
 			@friend_servers.each do |server|
 				if ( server.status == "RUNNING" and server.can_build?( job ) and
 					not server.has_waiting_jobs and 
+					not server.job_initializing and 
 					server.get_number_of_empty_room > 0 )
 					candidates.push server
 				end
diff --git a/src/build_server/RemoteBuildServer.rb b/src/build_server/RemoteBuildServer.rb
index c942ecc..d2fcca9 100644
--- a/src/build_server/RemoteBuildServer.rb
+++ b/src/build_server/RemoteBuildServer.rb
@@ -35,6 +35,7 @@ class RemoteBuildServer
 	attr_accessor :ip, :port, :status, :host_os
 	attr_accessor :max_working_jobs, :working_jobs, :waiting_jobs
 	attr_accessor :pkgserver_url, :path
+	attr_accessor :job_initializing
 
 	# initialize
 	def initialize(ip, port, parent)
@@ -47,6 +48,7 @@ class RemoteBuildServer
 		@waiting_jobs = []
 		@pkgserver_url = parent.pkgserver_url
 		@path = ""
+		@job_initializing = false
 	end
 
 
diff --git a/src/build_server/RemoteBuilder.rb b/src/build_server/RemoteBuilder.rb
index e3a594b..2cee27e 100644
--- a/src/build_server/RemoteBuilder.rb
+++ b/src/build_server/RemoteBuilder.rb
@@ -37,10 +37,11 @@ class RemoteBuilder
 	attr_accessor :id, :log
 
 	# initialize
-	def initialize( id, addr, port, ftp_addr, ftp_port, ftp_username, ftp_passwd)
+	def initialize( id, server,ftp_addr, ftp_port, ftp_username, ftp_passwd)
 		@id = id
-		@addr = addr
-		@port = port
+		@server = server
+		@addr = server.ip
+		@port = server.port
 		@ftp_addr = ftp_addr
 		@ftp_port = ftp_port
 		@ftp_username = ftp_username
@@ -57,14 +58,17 @@ class RemoteBuilder
 		dock = Utils.create_uniq_name()
 
 		# send local packages
+		@server.job_initializing = true
 		local_pkgs.each do |pkg_path|
            	@log.info( "Sending file... : #{pkg_path}", Log::LV_USER )
 			result = send_file_to_remote( pkg_path, dock )
 			if not result then
             	@log.error( "File transfering failed!", Log::LV_USER )
+				@server.job_initializing = false
 				return false
 			end
 		end
+		@server.job_initializing = false
 
 		# send build request
 		@log.info( "Sending build request to remote server...", Log::LV_USER )