bosh-director 1.3160.0 → 1.3163.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/bosh-director-worker +2 -14
- data/db/migrations/director/20150513225143_ip_addresses.rb +11 -0
- data/db/migrations/director/20150702004608_add_links.rb +8 -0
- data/db/migrations/director/20150708231924_add_link_spec.rb +7 -0
- data/db/migrations/director/20150724183256_add_debugging_to_ip_addresses.rb +8 -0
- data/db/migrations/director/20150730225029_add_uuid_to_instances.rb +16 -0
- data/db/migrations/director/20150803215805_add_availabililty_zone_and_cloud_properties_to_instances.rb +8 -0
- data/db/migrations/director/20150804211419_add_compilation_flag_to_instance.rb +7 -0
- data/db/migrations/director/20150918003455_add_bootstrap_node_to_instance.rb +7 -0
- data/db/migrations/director/20151008232214_add_dns_records.rb +7 -0
- data/db/migrations/director/20151015172551_add_orphan_disks_and_snapshots.rb +29 -0
- data/db/migrations/director/20151030222853_add_templates_to_instance.rb +10 -0
- data/db/migrations/director/20151031001039_add_spec_to_instance.rb +19 -0
- data/db/migrations/director/20151109190602_rename_orphan_columns.rb +13 -0
- data/lib/bosh/director.rb +19 -9
- data/lib/bosh/director/agent_client.rb +0 -17
- data/lib/bosh/director/api/cloud_config_manager.rb +7 -5
- data/lib/bosh/director/api/controllers/base_controller.rb +3 -2
- data/lib/bosh/director/api/controllers/cleanup_controller.rb +15 -0
- data/lib/bosh/director/api/controllers/deployments_controller.rb +38 -26
- data/lib/bosh/director/api/controllers/disks_controller.rb +20 -0
- data/lib/bosh/director/api/controllers/info_controller.rb +2 -2
- data/lib/bosh/director/api/controllers/releases_controller.rb +1 -16
- data/lib/bosh/director/api/controllers/stemcells_controller.rb +1 -9
- data/lib/bosh/director/api/deployment_manager.rb +2 -1
- data/lib/bosh/director/api/instance_lookup.rb +17 -0
- data/lib/bosh/director/api/instance_manager.rb +20 -10
- data/lib/bosh/director/api/release_manager.rb +28 -8
- data/lib/bosh/director/api/resurrector_manager.rb +9 -2
- data/lib/bosh/director/api/route_configuration.rb +2 -0
- data/lib/bosh/director/api/snapshot_manager.rb +9 -5
- data/lib/bosh/director/api/stemcell_manager.rb +50 -0
- data/lib/bosh/director/app.rb +1 -1
- data/lib/bosh/director/cloudcheck_helper.rb +119 -132
- data/lib/bosh/director/compile_task.rb +1 -1
- data/lib/bosh/director/compile_task_generator.rb +2 -2
- data/lib/bosh/director/config.rb +21 -12
- data/lib/bosh/director/deployment_deleter.rb +69 -0
- data/lib/bosh/director/deployment_plan.rb +35 -4
- data/lib/bosh/director/deployment_plan/agent_state_migrator.rb +47 -0
- data/lib/bosh/director/deployment_plan/assembler.rb +115 -241
- data/lib/bosh/director/deployment_plan/availability_zone.rb +27 -0
- data/lib/bosh/director/deployment_plan/cloud_manifest_parser.rb +144 -35
- data/lib/bosh/director/deployment_plan/compilation_config.rb +21 -19
- data/lib/bosh/director/deployment_plan/compilation_instance_pool.rb +169 -0
- data/lib/bosh/director/deployment_plan/deployment_repo.rb +4 -8
- data/lib/bosh/director/deployment_plan/deployment_spec_parser.rb +13 -1
- data/lib/bosh/director/deployment_plan/deployment_validator.rb +17 -0
- data/lib/bosh/director/deployment_plan/desired_instance.rb +15 -0
- data/lib/bosh/director/deployment_plan/{disk_pool.rb → disk_type.rb} +14 -19
- data/lib/bosh/director/deployment_plan/dynamic_network.rb +105 -53
- data/lib/bosh/director/deployment_plan/dynamic_network_subnet.rb +13 -0
- data/lib/bosh/director/deployment_plan/env.rb +18 -0
- data/lib/bosh/director/deployment_plan/global_network_resolver.rb +77 -0
- data/lib/bosh/director/deployment_plan/instance.rb +222 -390
- data/lib/bosh/director/deployment_plan/instance_network_reservations.rb +71 -0
- data/lib/bosh/director/deployment_plan/instance_plan.rb +336 -0
- data/lib/bosh/director/deployment_plan/instance_plan_factory.rb +54 -0
- data/lib/bosh/director/deployment_plan/instance_plan_sorter.rb +61 -0
- data/lib/bosh/director/deployment_plan/instance_planner.rb +101 -0
- data/lib/bosh/director/deployment_plan/instance_repository.rb +36 -0
- data/lib/bosh/director/deployment_plan/instance_spec.rb +154 -0
- data/lib/bosh/director/deployment_plan/ip_provider/database_ip_repo.rb +136 -0
- data/lib/bosh/director/deployment_plan/ip_provider/in_memory_ip_repo.rb +81 -0
- data/lib/bosh/director/deployment_plan/ip_provider/ip_provider.rb +153 -0
- data/lib/bosh/director/deployment_plan/ip_provider/ip_provider_factory.rb +22 -0
- data/lib/bosh/director/deployment_plan/job.rb +116 -53
- data/lib/bosh/director/deployment_plan/job_availability_zone_parser.rb +49 -0
- data/lib/bosh/director/deployment_plan/job_migrator.rb +90 -0
- data/lib/bosh/director/deployment_plan/job_network.rb +42 -0
- data/lib/bosh/director/deployment_plan/job_network_parser.rb +118 -0
- data/lib/bosh/director/deployment_plan/job_spec_parser.rb +123 -126
- data/lib/bosh/director/deployment_plan/links/link.rb +30 -0
- data/lib/bosh/director/deployment_plan/links/link_lookup.rb +66 -0
- data/lib/bosh/director/deployment_plan/links/link_path.rb +27 -0
- data/lib/bosh/director/deployment_plan/links/links_resolver.rb +70 -0
- data/lib/bosh/director/deployment_plan/links/template_link.rb +21 -0
- data/lib/bosh/director/deployment_plan/manifest_migrator.rb +3 -17
- data/lib/bosh/director/deployment_plan/manifest_validator.rb +46 -0
- data/lib/bosh/director/deployment_plan/manual_network.rb +70 -97
- data/lib/bosh/director/deployment_plan/manual_network_subnet.rb +148 -0
- data/lib/bosh/director/deployment_plan/network.rb +50 -39
- data/lib/bosh/director/deployment_plan/network_planner.rb +4 -0
- data/lib/bosh/director/deployment_plan/network_planner/plan.rb +26 -0
- data/lib/bosh/director/deployment_plan/network_planner/planner.rb +21 -0
- data/lib/bosh/director/deployment_plan/network_planner/reservation_reconciler.rb +81 -0
- data/lib/bosh/director/deployment_plan/network_planner/vip_static_ips_planner.rb +50 -0
- data/lib/bosh/director/deployment_plan/network_settings.rb +65 -0
- data/lib/bosh/director/deployment_plan/options/skip_drain.rb +7 -0
- data/lib/bosh/director/deployment_plan/package_validator.rb +79 -0
- data/lib/bosh/director/deployment_plan/placement_planner.rb +8 -0
- data/lib/bosh/director/deployment_plan/placement_planner/availability_zone_picker.rb +90 -0
- data/lib/bosh/director/deployment_plan/placement_planner/bruteforce_ip_allocation.rb +124 -0
- data/lib/bosh/director/deployment_plan/placement_planner/index_assigner.rb +32 -0
- data/lib/bosh/director/deployment_plan/placement_planner/networks_to_static_ips.rb +125 -0
- data/lib/bosh/director/deployment_plan/placement_planner/placed_desired_instances.rb +40 -0
- data/lib/bosh/director/deployment_plan/placement_planner/plan.rb +42 -0
- data/lib/bosh/director/deployment_plan/placement_planner/static_ips_availability_zone_picker.rb +237 -0
- data/lib/bosh/director/deployment_plan/placement_planner/unplaced_existing_instances.rb +53 -0
- data/lib/bosh/director/deployment_plan/planner.rb +186 -74
- data/lib/bosh/director/deployment_plan/planner_factory.rb +30 -147
- data/lib/bosh/director/deployment_plan/release_version.rb +3 -3
- data/lib/bosh/director/deployment_plan/resource_pool.rb +2 -174
- data/lib/bosh/director/deployment_plan/stemcell.rb +57 -14
- data/lib/bosh/director/deployment_plan/steps/package_compile_step.rb +28 -135
- data/lib/bosh/director/deployment_plan/steps/update_step.rb +23 -44
- data/lib/bosh/director/deployment_plan/template.rb +15 -4
- data/lib/bosh/director/deployment_plan/vip_network.rb +14 -42
- data/lib/bosh/director/deployment_plan/vm.rb +1 -99
- data/lib/bosh/director/deployment_plan/vm_type.rb +27 -0
- data/lib/bosh/director/disk_manager.rb +268 -0
- data/lib/bosh/director/dns/canonicalizer.rb +28 -0
- data/lib/bosh/director/dns/dns_manager.rb +163 -0
- data/lib/bosh/director/dns/local_dns_repo.rb +20 -0
- data/lib/bosh/director/dns/powerdns.rb +170 -0
- data/lib/bosh/director/errand/job_manager.rb +18 -29
- data/lib/bosh/director/error_ignorer.rb +16 -0
- data/lib/bosh/director/errors.rb +51 -20
- data/lib/bosh/director/event_log.rb +6 -0
- data/lib/bosh/director/instance_deleter.rb +53 -81
- data/lib/bosh/director/instance_reuser.rb +89 -0
- data/lib/bosh/director/instance_updater.rb +139 -281
- data/lib/bosh/director/instance_updater/preparer.rb +8 -5
- data/lib/bosh/director/instance_updater/state_applier.rb +21 -0
- data/lib/bosh/director/ip_util.rb +46 -26
- data/lib/bosh/director/job_renderer.rb +22 -10
- data/lib/bosh/director/job_runner.rb +1 -4
- data/lib/bosh/director/job_updater.rb +47 -35
- data/lib/bosh/director/job_updater_factory.rb +5 -4
- data/lib/bosh/director/jobs/base_job.rb +8 -0
- data/lib/bosh/director/jobs/cleanup_artifacts.rb +93 -0
- data/lib/bosh/director/jobs/delete_deployment.rb +10 -154
- data/lib/bosh/director/jobs/delete_deployment_snapshots.rb +1 -1
- data/lib/bosh/director/jobs/delete_orphan_disks.rb +44 -0
- data/lib/bosh/director/jobs/delete_release.rb +19 -196
- data/lib/bosh/director/jobs/delete_stemcell.rb +10 -76
- data/lib/bosh/director/jobs/export_release.rb +41 -121
- data/lib/bosh/director/jobs/fetch_logs.rb +0 -6
- data/lib/bosh/director/jobs/helpers.rb +10 -0
- data/lib/bosh/director/jobs/helpers/blob_deleter.rb +24 -0
- data/lib/bosh/director/jobs/helpers/compiled_package_deleter.rb +24 -0
- data/lib/bosh/director/jobs/helpers/name_version_release_deleter.rb +48 -0
- data/lib/bosh/director/jobs/helpers/package_deleter.rb +33 -0
- data/lib/bosh/director/jobs/helpers/release_deleter.rb +52 -0
- data/lib/bosh/director/jobs/helpers/release_version_deleter.rb +115 -0
- data/lib/bosh/director/jobs/helpers/releases_to_delete_picker.rb +31 -0
- data/lib/bosh/director/jobs/helpers/stemcell_deleter.rb +61 -0
- data/lib/bosh/director/jobs/helpers/stemcells_to_delete_picker.rb +30 -0
- data/lib/bosh/director/jobs/helpers/template_deleter.rb +20 -0
- data/lib/bosh/director/jobs/release/release_job.rb +18 -7
- data/lib/bosh/director/jobs/run_errand.rb +57 -36
- data/lib/bosh/director/jobs/scheduled_orphan_cleanup.rb +46 -0
- data/lib/bosh/director/jobs/ssh.rb +50 -17
- data/lib/bosh/director/jobs/update_deployment.rb +29 -11
- data/lib/bosh/director/jobs/update_release.rb +25 -4
- data/lib/bosh/director/jobs/vm_state.rb +23 -32
- data/lib/bosh/director/lock.rb +13 -8
- data/lib/bosh/director/logs_fetcher.rb +1 -1
- data/lib/bosh/director/models.rb +3 -0
- data/lib/bosh/director/models/compiled_package.rb +3 -3
- data/lib/bosh/director/models/deployment.rb +10 -0
- data/lib/bosh/director/models/instance.rb +77 -1
- data/lib/bosh/director/models/ip_address.rb +26 -0
- data/lib/bosh/director/models/orphan_disk.rb +23 -0
- data/lib/bosh/director/models/orphan_snapshot.rb +14 -0
- data/lib/bosh/director/models/template.rb +32 -9
- data/lib/bosh/director/models/vm.rb +5 -8
- data/lib/bosh/director/network_reservation.rb +69 -99
- data/lib/bosh/director/problem_handlers/inactive_disk.rb +5 -20
- data/lib/bosh/director/problem_handlers/missing_disk.rb +2 -13
- data/lib/bosh/director/problem_resolver.rb +2 -2
- data/lib/bosh/director/problem_scanner/vm_scan_stage.rb +2 -21
- data/lib/bosh/director/scheduler.rb +23 -6
- data/lib/bosh/director/{instance_updater/stopper.rb → stopper.rb} +24 -18
- data/lib/bosh/director/tagged_logger.rb +30 -0
- data/lib/bosh/director/transactor.rb +9 -0
- data/lib/bosh/director/version.rb +1 -1
- data/lib/bosh/director/vm_creator.rb +91 -19
- data/lib/bosh/director/vm_deleter.rb +25 -0
- data/lib/bosh/director/vm_recreator.rb +15 -0
- data/lib/cloud/dummy.rb +381 -94
- metadata +110 -30
- data/lib/bosh/director/deployment_plan/dns_binder.rb +0 -45
- data/lib/bosh/director/deployment_plan/instance_vm_binder.rb +0 -37
- data/lib/bosh/director/deployment_plan/network_subnet.rb +0 -166
- data/lib/bosh/director/deployment_plan/resource_pools.rb +0 -68
- data/lib/bosh/director/dns_helper.rb +0 -223
- data/lib/bosh/director/instance_updater/network_updater.rb +0 -110
- data/lib/bosh/director/instance_updater/vm_updater.rb +0 -189
- data/lib/bosh/director/problem_handlers/out_of_sync_vm.rb +0 -64
- data/lib/bosh/director/problem_handlers/unbound_instance_vm.rb +0 -85
- data/lib/bosh/director/resource_pool_updater.rb +0 -174
- data/lib/bosh/director/vm_data.rb +0 -63
- data/lib/bosh/director/vm_reuser.rb +0 -63
@@ -0,0 +1,61 @@
|
|
1
|
+
module Bosh::Director::DeploymentPlan
|
2
|
+
class InstancePlanSorter
|
3
|
+
def initialize(logger)
|
4
|
+
@logger = logger
|
5
|
+
end
|
6
|
+
|
7
|
+
def sort(instance_plans)
|
8
|
+
return [] if instance_plans.empty?
|
9
|
+
|
10
|
+
@logger.debug('Sorting instance plan to update them always in the same order')
|
11
|
+
|
12
|
+
@sorted_instance_plans = []
|
13
|
+
bootstrap_instance_plan = instance_plans.find { |instance_plan| instance_plan.instance.bootstrap? }
|
14
|
+
@sorted_instance_plans << bootstrap_instance_plan
|
15
|
+
|
16
|
+
bootstrap_az = bootstrap_instance_plan.instance.availability_zone_name
|
17
|
+
remaining_instance_plans = instance_plans - [bootstrap_instance_plan]
|
18
|
+
|
19
|
+
sorted_instance_plans_for_bootstrap_az = sorted_instance_plans_in_special_az(bootstrap_az, remaining_instance_plans)
|
20
|
+
remaining_instance_plans = remaining_instance_plans - sorted_instance_plans_for_bootstrap_az
|
21
|
+
|
22
|
+
sorted_instance_plans_for_no_az = sorted_instance_plans_in_special_az(nil, remaining_instance_plans)
|
23
|
+
remaining_instance_plans = remaining_instance_plans - sorted_instance_plans_for_no_az
|
24
|
+
|
25
|
+
instance_plans_sorted_by_az = remaining_instance_plans.sort do |plan1, plan2|
|
26
|
+
plan1.instance.availability_zone_name <=> plan2.instance.availability_zone_name
|
27
|
+
end
|
28
|
+
|
29
|
+
current_az = instance_plans_sorted_by_az.first.instance.availability_zone_name if instance_plans_sorted_by_az.any?
|
30
|
+
instance_plans_in_current_az = []
|
31
|
+
instance_plans_sorted_by_az.each do |instance_plan|
|
32
|
+
if instance_plan.instance.availability_zone_name == current_az
|
33
|
+
instance_plans_in_current_az << instance_plan
|
34
|
+
else
|
35
|
+
@sorted_instance_plans << sort_in_az(instance_plans_in_current_az)
|
36
|
+
current_az = instance_plan.instance.availability_zone_name
|
37
|
+
instance_plans_in_current_az = [instance_plan]
|
38
|
+
end
|
39
|
+
end
|
40
|
+
@sorted_instance_plans << sort_in_az(instance_plans_in_current_az)
|
41
|
+
@sorted_instance_plans.flatten
|
42
|
+
end
|
43
|
+
|
44
|
+
private
|
45
|
+
def sort_in_az(instance_plans)
|
46
|
+
instance_plans.sort { |plan1, plan2|
|
47
|
+
"#{plan1.instance.job_name}/#{plan1.instance.uuid}" <=> "#{plan2.instance.job_name}/#{plan2.instance.uuid}"
|
48
|
+
}
|
49
|
+
end
|
50
|
+
|
51
|
+
def sorted_instance_plans_in_special_az(az, instance_plans)
|
52
|
+
all_instance_plans_for_az = instance_plans
|
53
|
+
.select do |instance_plan|
|
54
|
+
instance_plan.instance.availability_zone_name == az
|
55
|
+
end
|
56
|
+
sorted_instances_for_az = sort_in_az(all_instance_plans_for_az)
|
57
|
+
@sorted_instance_plans << sorted_instances_for_az
|
58
|
+
sorted_instances_for_az
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|
@@ -0,0 +1,101 @@
|
|
1
|
+
module Bosh
|
2
|
+
module Director
|
3
|
+
module DeploymentPlan
|
4
|
+
class InstancePlanner
|
5
|
+
def initialize(instance_plan_factory, logger)
|
6
|
+
@instance_plan_factory = instance_plan_factory
|
7
|
+
@logger = logger
|
8
|
+
end
|
9
|
+
|
10
|
+
def plan_job_instances(job, desired_instances, existing_instance_models)
|
11
|
+
network_planner = NetworkPlanner::Planner.new(@logger)
|
12
|
+
placement_plan = PlacementPlanner::Plan.new(@instance_plan_factory, network_planner, @logger)
|
13
|
+
vip_networks, non_vip_networks = job.networks.to_a.partition(&:vip?)
|
14
|
+
instance_plans = placement_plan.create_instance_plans(desired_instances, existing_instance_models, non_vip_networks, job.availability_zones, job.name)
|
15
|
+
|
16
|
+
log_outcome(instance_plans)
|
17
|
+
|
18
|
+
desired_instance_plans = instance_plans.reject(&:obsolete?)
|
19
|
+
vip_static_ips_planner = NetworkPlanner::VipStaticIpsPlanner.new(network_planner, @logger)
|
20
|
+
vip_static_ips_planner.add_vip_network_plans(desired_instance_plans, vip_networks)
|
21
|
+
reconcile_network_plans(desired_instance_plans)
|
22
|
+
|
23
|
+
elect_bootstrap_instance(desired_instance_plans)
|
24
|
+
|
25
|
+
instance_plans
|
26
|
+
end
|
27
|
+
|
28
|
+
def plan_obsolete_jobs(desired_jobs, existing_instances)
|
29
|
+
desired_job_names = Set.new(desired_jobs.map(&:name))
|
30
|
+
migrating_job_names = Set.new(desired_jobs.map(&:migrated_from).flatten.map(&:name))
|
31
|
+
existing_instances.reject do |existing_instance_model|
|
32
|
+
desired_job_names.include?(existing_instance_model.job) ||
|
33
|
+
migrating_job_names.include?(existing_instance_model.job)
|
34
|
+
end.map do |existing_instance|
|
35
|
+
@instance_plan_factory.obsolete_instance_plan(existing_instance)
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
private
|
40
|
+
|
41
|
+
def elect_bootstrap_instance(desired_instance_plans)
|
42
|
+
bootstrap_instance_plans = desired_instance_plans.select { |i| i.instance.bootstrap? }
|
43
|
+
|
44
|
+
if bootstrap_instance_plans.size == 1
|
45
|
+
bootstrap_instance_plan = bootstrap_instance_plans.first
|
46
|
+
|
47
|
+
instance = bootstrap_instance_plan.instance
|
48
|
+
@logger.info("Found existing bootstrap instance '#{instance}' in az '#{bootstrap_instance_plan.desired_instance.availability_zone}'")
|
49
|
+
else
|
50
|
+
return if desired_instance_plans.empty?
|
51
|
+
|
52
|
+
if bootstrap_instance_plans.size > 1
|
53
|
+
@logger.info('Found multiple existing bootstrap instances. Going to pick a new bootstrap instance.')
|
54
|
+
else
|
55
|
+
@logger.info('No existing bootstrap instance. Going to pick a new bootstrap instance.')
|
56
|
+
end
|
57
|
+
lowest_indexed_desired_instance_plan = desired_instance_plans
|
58
|
+
.reject { |instance_plan| instance_plan.desired_instance.index.nil? }
|
59
|
+
.sort_by { |instance_plan| instance_plan.desired_instance.index }
|
60
|
+
.first
|
61
|
+
|
62
|
+
desired_instance_plans.each do |instance_plan|
|
63
|
+
instance = instance_plan.instance
|
64
|
+
if instance_plan == lowest_indexed_desired_instance_plan
|
65
|
+
@logger.info("Marking new bootstrap instance '#{instance}' in az '#{instance_plan.desired_instance.availability_zone}'")
|
66
|
+
instance.mark_as_bootstrap
|
67
|
+
else
|
68
|
+
instance.unmark_as_bootstrap
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
def reconcile_network_plans(instance_plans)
|
75
|
+
instance_plans.each do |instance_plan|
|
76
|
+
network_plans = NetworkPlanner::ReservationReconciler.new(instance_plan, @logger)
|
77
|
+
.reconcile(instance_plan.instance.existing_network_reservations)
|
78
|
+
instance_plan.network_plans = network_plans
|
79
|
+
end
|
80
|
+
end
|
81
|
+
|
82
|
+
def log_outcome(instance_plans)
|
83
|
+
instance_plans.select(&:new?).each do |instance_plan|
|
84
|
+
instance = instance_plan.desired_instance
|
85
|
+
@logger.info("New desired instance '#{instance.job.name}/#{instance.index}' in az '#{instance.availability_zone}'")
|
86
|
+
end
|
87
|
+
|
88
|
+
instance_plans.select(&:existing?).each do |instance_plan|
|
89
|
+
instance = instance_plan.existing_instance
|
90
|
+
@logger.info("Existing desired instance '#{instance.job}/#{instance.index}' in az '#{instance_plan.desired_instance.availability_zone}'")
|
91
|
+
end
|
92
|
+
|
93
|
+
instance_plans.select(&:obsolete?).each do |instance_plan|
|
94
|
+
instance = instance_plan.existing_instance
|
95
|
+
@logger.info("Obsolete instance '#{instance.job}/#{instance.index}' in az '#{instance.availability_zone}'")
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
@@ -0,0 +1,36 @@
|
|
1
|
+
module Bosh::Director::DeploymentPlan
|
2
|
+
class InstanceRepository
|
3
|
+
def initialize(logger)
|
4
|
+
@logger = logger
|
5
|
+
end
|
6
|
+
|
7
|
+
def fetch_existing(desired_instance, existing_instance_model, existing_instance_state)
|
8
|
+
@logger.debug("Fetching existing instance for: #{existing_instance_model.inspect}")
|
9
|
+
# if state was not specified in manifest, use saved state
|
10
|
+
job_state = desired_instance.job.state_for_instance(existing_instance_model) || existing_instance_model.state
|
11
|
+
@logger.debug("Job instance states: #{desired_instance.job.instance_states}, found: #{desired_instance.job.state_for_instance(existing_instance_model)}, state: #{job_state}")
|
12
|
+
|
13
|
+
instance = Instance.create_from_job(desired_instance.job, desired_instance.index, job_state, desired_instance.deployment.model, existing_instance_state, existing_instance_model.availability_zone, @logger)
|
14
|
+
instance.bind_existing_instance_model(existing_instance_model)
|
15
|
+
|
16
|
+
if existing_instance_model.ip_addresses.any?
|
17
|
+
existing_network_reservations = InstanceNetworkReservations.create_from_db(instance, desired_instance.deployment, @logger)
|
18
|
+
elsif existing_instance_state
|
19
|
+
# This is for backwards compatibility when we did not store
|
20
|
+
# network reservations in DB and constructed them from instance state
|
21
|
+
existing_network_reservations = InstanceNetworkReservations.create_from_state(instance, existing_instance_state, desired_instance.deployment, @logger)
|
22
|
+
else
|
23
|
+
existing_network_reservations = InstanceNetworkReservations.new(@logger)
|
24
|
+
end
|
25
|
+
instance.bind_existing_reservations(existing_network_reservations)
|
26
|
+
instance
|
27
|
+
end
|
28
|
+
|
29
|
+
def create(desired_instance, index)
|
30
|
+
@logger.debug("Creating new desired instance for: #{desired_instance.inspect}")
|
31
|
+
instance = Instance.create_from_job(desired_instance.job, index, 'started', desired_instance.deployment.model, nil, desired_instance.az, @logger)
|
32
|
+
instance.bind_new_instance_model
|
33
|
+
instance
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
@@ -0,0 +1,154 @@
|
|
1
|
+
module Bosh::Director
|
2
|
+
module DeploymentPlan
|
3
|
+
class InstanceSpec
|
4
|
+
def self.create_empty
|
5
|
+
EmptyInstanceSpec.new
|
6
|
+
end
|
7
|
+
|
8
|
+
def self.create_from_database(spec, instance)
|
9
|
+
new(spec, instance)
|
10
|
+
end
|
11
|
+
|
12
|
+
def self.create_from_instance_plan(instance_plan)
|
13
|
+
instance = instance_plan.instance
|
14
|
+
deployment_name = instance.deployment_model.name
|
15
|
+
job = instance_plan.desired_instance.job
|
16
|
+
instance_plan = instance_plan
|
17
|
+
dns_manager = DnsManager.create
|
18
|
+
|
19
|
+
spec = {
|
20
|
+
'deployment' => deployment_name,
|
21
|
+
'job' => job.spec,
|
22
|
+
'index' => instance.index,
|
23
|
+
'bootstrap' => instance.bootstrap?,
|
24
|
+
'id' => instance.uuid,
|
25
|
+
'az' => instance.availability_zone_name,
|
26
|
+
'networks' => instance_plan.network_settings_hash,
|
27
|
+
'vm_type' => job.vm_type.spec,
|
28
|
+
'stemcell' => job.stemcell.spec,
|
29
|
+
'env' => job.env.spec,
|
30
|
+
'packages' => job.package_spec,
|
31
|
+
'properties' => job.properties,
|
32
|
+
'dns_domain_name' => dns_manager.dns_domain_name,
|
33
|
+
'links' => job.link_spec,
|
34
|
+
}
|
35
|
+
|
36
|
+
if job.persistent_disk_type
|
37
|
+
# supply both for reverse compatibility with old agent
|
38
|
+
spec['persistent_disk'] = job.persistent_disk_type.disk_size
|
39
|
+
# old agents will ignore this pool
|
40
|
+
# keep disk pool for backwards compatibility
|
41
|
+
spec['persistent_disk_pool'] = job.persistent_disk_type.spec
|
42
|
+
spec['persistent_disk_type'] = job.persistent_disk_type.spec
|
43
|
+
else
|
44
|
+
spec['persistent_disk'] = 0
|
45
|
+
end
|
46
|
+
|
47
|
+
new(spec, instance)
|
48
|
+
end
|
49
|
+
|
50
|
+
def initialize(full_spec, instance)
|
51
|
+
@full_spec = full_spec
|
52
|
+
@instance = instance
|
53
|
+
end
|
54
|
+
|
55
|
+
def as_template_spec
|
56
|
+
TemplateSpec.new(full_spec).spec
|
57
|
+
end
|
58
|
+
|
59
|
+
def as_apply_spec
|
60
|
+
ApplySpec.new(full_spec).spec
|
61
|
+
end
|
62
|
+
|
63
|
+
def full_spec
|
64
|
+
# re-generate spec with rendered templates info
|
65
|
+
# since job renderer sets it directly on instance
|
66
|
+
spec = @full_spec
|
67
|
+
|
68
|
+
if @instance.template_hashes
|
69
|
+
spec['template_hashes'] = @instance.template_hashes
|
70
|
+
end
|
71
|
+
|
72
|
+
if @instance.rendered_templates_archive
|
73
|
+
spec['rendered_templates_archive'] = @instance.rendered_templates_archive.spec
|
74
|
+
end
|
75
|
+
|
76
|
+
if @instance.configuration_hash
|
77
|
+
spec['configuration_hash'] = @instance.configuration_hash
|
78
|
+
end
|
79
|
+
|
80
|
+
spec
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
private
|
85
|
+
|
86
|
+
class EmptyInstanceSpec < InstanceSpec
|
87
|
+
def initialize
|
88
|
+
end
|
89
|
+
|
90
|
+
def full_spec
|
91
|
+
{}
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
95
|
+
class TemplateSpec
|
96
|
+
def initialize(full_spec)
|
97
|
+
@full_spec = full_spec
|
98
|
+
@dns_manager = DnsManager.create
|
99
|
+
end
|
100
|
+
|
101
|
+
def spec
|
102
|
+
keys = [
|
103
|
+
'deployment',
|
104
|
+
'job',
|
105
|
+
'index',
|
106
|
+
'bootstrap',
|
107
|
+
'id',
|
108
|
+
'az',
|
109
|
+
'networks',
|
110
|
+
'packages',
|
111
|
+
'properties',
|
112
|
+
'dns_domain_name',
|
113
|
+
'links',
|
114
|
+
'persistent_disk'
|
115
|
+
]
|
116
|
+
template_hash = @full_spec.select {|k,v| keys.include?(k) }
|
117
|
+
|
118
|
+
networks_hash = template_hash['networks']
|
119
|
+
networks_hash_with_dns = networks_hash.each_pair do |network_name, network_settings|
|
120
|
+
settings_with_dns = network_settings.merge({'dns_record_name' => @dns_manager.dns_record_name(@full_spec['index'], @full_spec['job']['name'], network_name, @full_spec['deployment'])})
|
121
|
+
networks_hash[network_name] = settings_with_dns
|
122
|
+
end
|
123
|
+
|
124
|
+
template_hash.merge({
|
125
|
+
'resource_pool' => @full_spec['vm_type']['name'],
|
126
|
+
'networks' => networks_hash_with_dns
|
127
|
+
})
|
128
|
+
end
|
129
|
+
end
|
130
|
+
|
131
|
+
class ApplySpec
|
132
|
+
def initialize(full_spec)
|
133
|
+
@full_spec = full_spec
|
134
|
+
end
|
135
|
+
|
136
|
+
def spec
|
137
|
+
keys = [
|
138
|
+
'deployment',
|
139
|
+
'job',
|
140
|
+
'index',
|
141
|
+
'id',
|
142
|
+
'networks',
|
143
|
+
'packages',
|
144
|
+
'dns_domain_name',
|
145
|
+
'configuration_hash',
|
146
|
+
'persistent_disk',
|
147
|
+
'template_hashes',
|
148
|
+
'rendered_templates_archive',
|
149
|
+
]
|
150
|
+
@full_spec.select {|k,_| keys.include?(k) }
|
151
|
+
end
|
152
|
+
end
|
153
|
+
end
|
154
|
+
end
|
@@ -0,0 +1,136 @@
|
|
1
|
+
module Bosh::Director::DeploymentPlan
|
2
|
+
class DatabaseIpRepo
|
3
|
+
include Bosh::Director::IpUtil
|
4
|
+
class IpFoundInDatabaseAndCanBeRetried < StandardError; end
|
5
|
+
class NoMoreIPsAvailableAndStopRetrying < StandardError; end
|
6
|
+
|
7
|
+
def initialize(logger)
|
8
|
+
@logger = Bosh::Director::TaggedLogger.new(logger, 'network-configuration')
|
9
|
+
end
|
10
|
+
|
11
|
+
def delete(ip, _)
|
12
|
+
cidr_ip = CIDRIP.new(ip)
|
13
|
+
|
14
|
+
ip_address = Bosh::Director::Models::IpAddress.first(address: cidr_ip.to_i)
|
15
|
+
|
16
|
+
if ip_address
|
17
|
+
@logger.debug("Releasing ip '#{cidr_ip}'")
|
18
|
+
ip_address.destroy
|
19
|
+
else
|
20
|
+
@logger.debug("Skipping releasing ip '#{cidr_ip}': not reserved")
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def add(reservation)
|
25
|
+
cidr_ip = CIDRIP.new(reservation.ip)
|
26
|
+
|
27
|
+
reservation_type = reservation.network.ip_type(cidr_ip)
|
28
|
+
|
29
|
+
reserve_with_instance_validation(
|
30
|
+
reservation.instance,
|
31
|
+
cidr_ip,
|
32
|
+
reservation,
|
33
|
+
reservation_type.eql?(:static)
|
34
|
+
)
|
35
|
+
|
36
|
+
reservation.resolve_type(reservation_type)
|
37
|
+
reservation.mark_reserved
|
38
|
+
@logger.debug("Reserved ip '#{cidr_ip}' for #{reservation.network.name} as #{reservation_type}")
|
39
|
+
end
|
40
|
+
|
41
|
+
def allocate_dynamic_ip(reservation, subnet)
|
42
|
+
begin
|
43
|
+
ip_address = try_to_allocate_dynamic_ip(reservation, subnet)
|
44
|
+
rescue NoMoreIPsAvailableAndStopRetrying
|
45
|
+
@logger.debug('Failed to allocate dynamic ip: no more available')
|
46
|
+
return nil
|
47
|
+
rescue IpFoundInDatabaseAndCanBeRetried
|
48
|
+
@logger.debug('Retrying to allocate dynamic ip: probably a race condition with another deployment')
|
49
|
+
# IP can be taken by other deployment that runs in parallel
|
50
|
+
# retry until succeeds or out of range
|
51
|
+
retry
|
52
|
+
end
|
53
|
+
|
54
|
+
@logger.debug("Allocated dynamic IP '#{ip_address.ip}' for #{reservation.network.name}")
|
55
|
+
ip_address.to_i
|
56
|
+
end
|
57
|
+
|
58
|
+
private
|
59
|
+
|
60
|
+
def try_to_allocate_dynamic_ip(reservation, subnet)
|
61
|
+
addresses_in_use = Set.new(all_ip_addresses)
|
62
|
+
|
63
|
+
first_range_address = subnet.range.first(Objectify: true).to_i - 1
|
64
|
+
addresses_we_cant_allocate = addresses_in_use
|
65
|
+
addresses_we_cant_allocate << first_range_address
|
66
|
+
|
67
|
+
addresses_we_cant_allocate.merge(subnet.restricted_ips.to_a) unless subnet.restricted_ips.empty?
|
68
|
+
addresses_we_cant_allocate.merge(subnet.static_ips.to_a) unless subnet.static_ips.empty?
|
69
|
+
# find first in-use address whose subsequent address is not in use
|
70
|
+
# the subsequent address must be free
|
71
|
+
addr = addresses_we_cant_allocate
|
72
|
+
.to_a
|
73
|
+
.reject {|a| a < first_range_address }
|
74
|
+
.sort
|
75
|
+
.find { |a| !addresses_we_cant_allocate.include?(a+1) }
|
76
|
+
ip_address = NetAddr::CIDRv4.new(addr+1)
|
77
|
+
|
78
|
+
unless subnet.range == ip_address || subnet.range.contains?(ip_address)
|
79
|
+
raise NoMoreIPsAvailableAndStopRetrying
|
80
|
+
end
|
81
|
+
|
82
|
+
save_ip(ip_address, reservation, false)
|
83
|
+
|
84
|
+
ip_address
|
85
|
+
end
|
86
|
+
|
87
|
+
def all_ip_addresses
|
88
|
+
Bosh::Director::Models::IpAddress.select(:address).all.map { |a| a.address }
|
89
|
+
end
|
90
|
+
|
91
|
+
def reserve_with_instance_validation(instance, ip, reservation, is_static)
|
92
|
+
# try to save IP first before validating its instance to prevent race conditions
|
93
|
+
save_ip(ip, reservation, is_static)
|
94
|
+
rescue IpFoundInDatabaseAndCanBeRetried
|
95
|
+
ip_address = Bosh::Director::Models::IpAddress.first(address: ip.to_i)
|
96
|
+
|
97
|
+
retry unless ip_address
|
98
|
+
|
99
|
+
validate_instance_and_update_reservation_type(instance, ip, ip_address, reservation.network.name, is_static)
|
100
|
+
end
|
101
|
+
|
102
|
+
def validate_instance_and_update_reservation_type(instance, ip, ip_address, network_name, is_static)
|
103
|
+
reserved_instance = ip_address.instance
|
104
|
+
if reserved_instance == instance.model
|
105
|
+
if ip_address.static != is_static || ip_address.network_name != network_name
|
106
|
+
reservation_type = is_static ? 'static' : 'dynamic'
|
107
|
+
@logger.debug("Updating reservation for ip '#{ip}' with type '#{reservation_type}' and network '#{network_name}'")
|
108
|
+
ip_address.update(static: is_static, network_name: network_name)
|
109
|
+
end
|
110
|
+
|
111
|
+
return ip_address
|
112
|
+
else
|
113
|
+
raise Bosh::Director::NetworkReservationAlreadyInUse,
|
114
|
+
"Failed to reserve IP '#{ip}' for instance '#{instance}': " +
|
115
|
+
"already reserved by instance '#{reserved_instance.job}/#{reserved_instance.index}' " +
|
116
|
+
"from deployment '#{reserved_instance.deployment.name}'"
|
117
|
+
end
|
118
|
+
end
|
119
|
+
|
120
|
+
def save_ip(ip, reservation, is_static)
|
121
|
+
reservation.instance.model.add_ip_address(
|
122
|
+
address: ip.to_i,
|
123
|
+
network_name: reservation.network.name,
|
124
|
+
task_id: Bosh::Director::Config.current_job.task_id,
|
125
|
+
static: is_static
|
126
|
+
)
|
127
|
+
rescue Sequel::ValidationFailed, Sequel::DatabaseError => e
|
128
|
+
error_message = e.message.downcase
|
129
|
+
if error_message.include?('unique') || error_message.include?('duplicate')
|
130
|
+
raise IpFoundInDatabaseAndCanBeRetried
|
131
|
+
else
|
132
|
+
raise e
|
133
|
+
end
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|