From 3372288c6f5ec990643918398ace721ee1e3992b Mon Sep 17 00:00:00 2001 From: Joseph Suh Date: Thu, 30 Jun 2011 14:24:27 -0400 Subject: [PATCH 1/5] fix bug 800759 --- nova/scheduler/zone_manager.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py index ba7403c1..e0daa01e 100644 --- a/nova/scheduler/zone_manager.py +++ b/nova/scheduler/zone_manager.py @@ -109,6 +109,7 @@ class ZoneManager(object): self.last_zone_db_check = datetime.datetime.min self.zone_states = {} # { : ZoneState } self.service_states = {} # { : { : { cap k : v }}} + self.service_time_stamp = {} # reported time self.green_pool = greenpool.GreenPool() def get_zone_list(self): @@ -125,14 +126,18 @@ class ZoneManager(object): # But it's likely to change once we understand what the Best-Match # code will need better. combined = {} # { _ : (min, max), ... } + allowed_time_diff = FLAGS.periodic_interval * 3 for host, host_dict in hosts_dict.iteritems(): - for service_name, service_dict in host_dict.iteritems(): - for cap, value in service_dict.iteritems(): - key = "%s_%s" % (service_name, cap) - min_value, max_value = combined.get(key, (value, value)) - min_value = min(min_value, value) - max_value = max(max_value, value) - combined[key] = (min_value, max_value) + if (utils.utcnow() - self.service_time_stamp[host]) <= \ + datetime.timedelta(seconds=allowed_time_diff): + for service_name, service_dict in host_dict.iteritems(): + for cap, value in service_dict.iteritems(): + key = "%s_%s" % (service_name, cap) + min_value, max_value = combined.get(key, \ + (value, value)) + min_value = min(min_value, value) + max_value = max(max_value, value) + combined[key] = (min_value, max_value) return combined @@ -174,3 +179,4 @@ class ZoneManager(object): service_caps = self.service_states.get(host, {}) service_caps[service_name] = capabilities self.service_states[host] = service_caps + self.service_time_stamp[host] = utils.utcnow() From 4f0e5268ac7a3d221ba27e86f1ff52fba9df4025 Mon Sep 17 00:00:00 2001 From: Devendra Modium Date: Thu, 7 Jul 2011 11:25:45 -0400 Subject: [PATCH 2/5] Comments Incorporated for Bug800759 --- Authors | 1 + nova/scheduler/zone_manager.py | 53 +++++++++++---- nova/tests/test_zones.py | 121 +++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 13 deletions(-) diff --git a/Authors b/Authors index c3a65f1b..67cd38bc 100644 --- a/Authors +++ b/Authors @@ -93,3 +93,4 @@ Yoshiaki Tamura Youcef Laribi Yuriy Taraday Zhixue Wu +Devendra Modium diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py index e0daa01e..2a081611 100644 --- a/nova/scheduler/zone_manager.py +++ b/nova/scheduler/zone_manager.py @@ -109,7 +109,6 @@ class ZoneManager(object): self.last_zone_db_check = datetime.datetime.min self.zone_states = {} # { : ZoneState } self.service_states = {} # { : { : { cap k : v }}} - self.service_time_stamp = {} # reported time self.green_pool = greenpool.GreenPool() def get_zone_list(self): @@ -126,19 +125,28 @@ class ZoneManager(object): # But it's likely to change once we understand what the Best-Match # code will need better. combined = {} # { _ : (min, max), ... } - allowed_time_diff = FLAGS.periodic_interval * 3 + stale_host_services = {} # { host1 : [svc1, svc2], host2 :[svc1]} for host, host_dict in hosts_dict.iteritems(): - if (utils.utcnow() - self.service_time_stamp[host]) <= \ - datetime.timedelta(seconds=allowed_time_diff): - for service_name, service_dict in host_dict.iteritems(): - for cap, value in service_dict.iteritems(): - key = "%s_%s" % (service_name, cap) - min_value, max_value = combined.get(key, \ - (value, value)) - min_value = min(min_value, value) - max_value = max(max_value, value) - combined[key] = (min_value, max_value) + for service_name, service_dict in host_dict.iteritems(): + #Check if the service capabilities became stale + if self.host_service_caps_stale(host, service_name): + if host not in stale_host_services: + stale_host_services[host] = [] # Adding host key once + stale_host_services[host].append(service_name) + continue + for cap, value in service_dict.iteritems(): + if cap == "timestamp": # Timestamp is not needed + continue + key = "%s_%s" % (service_name, cap) + min_value, max_value = combined.get(key, \ + (value, value)) + min_value = min(min_value, value) + max_value = max(max_value, value) + combined[key] = (min_value, max_value) + + # Delete the expired host services + self.delete_expired_host_services(stale_host_services) return combined def _refresh_from_db(self, context): @@ -177,6 +185,25 @@ class ZoneManager(object): logging.debug(_("Received %(service_name)s service update from " "%(host)s: %(capabilities)s") % locals()) service_caps = self.service_states.get(host, {}) + capabilities["timestamp"] = utils.utcnow() # Reported time service_caps[service_name] = capabilities self.service_states[host] = service_caps - self.service_time_stamp[host] = utils.utcnow() + + def host_service_caps_stale(self, host, service): + """Check if host service capabilites are not recent enough.""" + allowed_time_diff = FLAGS.periodic_interval * 3 + caps = self.service_states[host][service] + if (utils.utcnow() - caps["timestamp"]) <= \ + datetime.timedelta(seconds=allowed_time_diff): + return False + return True + + def delete_expired_host_services(self, host_services_dict): + """Delete all the inactive host services information.""" + for host, services in host_services_dict.iteritems(): + service_caps = self.service_states[host] + for service in services: + del service_caps[service] + if len(service_caps) == 0: # Delete host if no services + del self.service_states[host] + diff --git a/nova/tests/test_zones.py b/nova/tests/test_zones.py index e132809d..f4661a32 100644 --- a/nova/tests/test_zones.py +++ b/nova/tests/test_zones.py @@ -198,3 +198,124 @@ class ZoneManagerTestCase(test.TestCase): self.assertEquals(zone_state.attempt, 3) self.assertFalse(zone_state.is_active) self.assertEquals(zone_state.name, None) + + def test_host_service_caps_stale(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + + # services just updated capabilities + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc2", "host1", dict(a=3, b=4)) + self.assertFalse(zm.host_service_caps_stale("host1", "svc1")) + self.assertFalse(zm.host_service_caps_stale("host1", "svc2")) + + # Both services became stale + time_future = utils.utcnow() + datetime.timedelta(seconds=expiry_time) + utils.set_time_override(time_future) + self.assertTrue(zm.host_service_caps_stale("host1", "svc1")) + self.assertTrue(zm.host_service_caps_stale("host1", "svc2")) + + # One service became stale + utils.clear_time_override() + caps = zm.service_states["host1"]["svc1"] + caps["timestamp"] = utils.utcnow() - \ + datetime.timedelta(seconds=expiry_time) + self.assertTrue(zm.host_service_caps_stale("host1", "svc1")) + self.assertFalse(zm.host_service_caps_stale("host1", "svc2")) + + def test_delete_expired_host_services(self): + zm = zone_manager.ZoneManager() + + # Delete one service in a host + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc2", "host1", dict(a=3, b=4)) + stale_host_services = {"host1": ["svc1"]} + zm.delete_expired_host_services(stale_host_services) + self.assertFalse("svc1" in zm.service_states["host1"]) + self.assertTrue("svc2" in zm.service_states["host1"]) + + # Delete all services in a host + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + stale_host_services = {"host1": ["svc1", "svc2"]} + zm.delete_expired_host_services(stale_host_services) + self.assertFalse("host1" in zm.service_states) + + # Delete one service per host + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) + stale_host_services = {"host1": ["svc1"], "host2": ["svc1"]} + zm.delete_expired_host_services(stale_host_services) + self.assertFalse("host1" in zm.service_states) + self.assertFalse("host2" in zm.service_states) + + def test_get_zone_capabilities(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + + # Service capabilities recent + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, dict(svc1_a=(1, 1), svc1_b=(2, 2))) + + # Service capabilities stale + time_future = utils.utcnow() + datetime.timedelta(seconds=expiry_time) + utils.set_time_override(time_future) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, {}) + + # Both host service capabilities recent + utils.clear_time_override() + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, dict(svc1_a=(1, 3), svc1_b=(2, 4))) + + # One host service capabilities become stale + serv_caps = zm.service_states["host1"]["svc1"] + serv_caps["timestamp"] = utils.utcnow() - \ + datetime.timedelta(seconds=expiry_time) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, dict(svc1_a=(3, 3), svc1_b=(4, 4))) + + # Multiple services per host + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) + zm.update_service_capabilities("svc2", "host2", dict(a=7, b=8)) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, dict(svc1_a=(1, 3), svc1_b=(2, 4), + svc2_a=(5, 7), svc2_b=(6, 8))) + + # Two host services among four become stale + serv_caps_1 = zm.service_states["host1"]["svc2"] + serv_caps_1["timestamp"] = utils.utcnow() - \ + datetime.timedelta(seconds=expiry_time) + serv_caps_2 = zm.service_states["host2"]["svc1"] + serv_caps_2["timestamp"] = utils.utcnow() - \ + datetime.timedelta(seconds=expiry_time) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, dict(svc1_a=(1, 1), svc1_b=(2, 2), + svc2_a=(7, 7), svc2_b=(8, 8))) + + # Three host services among four become stale + zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) + zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) + serv_caps_1 = zm.service_states["host1"]["svc2"] + serv_caps_1["timestamp"] = utils.utcnow() - \ + datetime.timedelta(seconds=expiry_time) + serv_caps_2 = zm.service_states["host2"]["svc1"] + serv_caps_2["timestamp"] = utils.utcnow() - \ + datetime.timedelta(seconds=expiry_time) + serv_caps_3 = zm.service_states["host2"]["svc2"] + serv_caps_3["timestamp"] = utils.utcnow() - \ + datetime.timedelta(seconds=expiry_time) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, dict(svc1_a=(1, 1), svc1_b=(2, 2))) + + # All the host services become stale + zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) + zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) + zm.update_service_capabilities("svc2", "host2", dict(a=7, b=8)) + utils.set_time_override(time_future) + caps = zm.get_zone_capabilities(None) + self.assertEquals(caps, {}) + From 97dbb30fd18cea6bb29b4565622b273de758b090 Mon Sep 17 00:00:00 2001 From: Devendra Modium Date: Thu, 7 Jul 2011 15:55:34 -0400 Subject: [PATCH 3/5] Comments for bugfix800759 and pep8 --- nova/scheduler/zone_manager.py | 12 ++--- nova/tests/test_zones.py | 88 +++++++++++++++++++++++++++------- 2 files changed, 76 insertions(+), 24 deletions(-) diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py index 2a081611..8f928ce9 100644 --- a/nova/scheduler/zone_manager.py +++ b/nova/scheduler/zone_manager.py @@ -125,7 +125,7 @@ class ZoneManager(object): # But it's likely to change once we understand what the Best-Match # code will need better. combined = {} # { _ : (min, max), ... } - stale_host_services = {} # { host1 : [svc1, svc2], host2 :[svc1]} + stale_host_services = {} # { host1 : [svc1, svc2], host2 :[svc1]} for host, host_dict in hosts_dict.iteritems(): for service_name, service_dict in host_dict.iteritems(): @@ -136,11 +136,10 @@ class ZoneManager(object): stale_host_services[host].append(service_name) continue for cap, value in service_dict.iteritems(): - if cap == "timestamp": # Timestamp is not needed + if cap == "timestamp": # Timestamp is not needed continue key = "%s_%s" % (service_name, cap) - min_value, max_value = combined.get(key, \ - (value, value)) + min_value, max_value = combined.get(key, (value, value)) min_value = min(min_value, value) max_value = max(max_value, value) combined[key] = (min_value, max_value) @@ -185,7 +184,7 @@ class ZoneManager(object): logging.debug(_("Received %(service_name)s service update from " "%(host)s: %(capabilities)s") % locals()) service_caps = self.service_states.get(host, {}) - capabilities["timestamp"] = utils.utcnow() # Reported time + capabilities["timestamp"] = utils.utcnow() # Reported time service_caps[service_name] = capabilities self.service_states[host] = service_caps @@ -204,6 +203,5 @@ class ZoneManager(object): service_caps = self.service_states[host] for service in services: del service_caps[service] - if len(service_caps) == 0: # Delete host if no services + if len(service_caps) == 0: # Delete host if no services del self.service_states[host] - diff --git a/nova/tests/test_zones.py b/nova/tests/test_zones.py index f4661a32..a943fee2 100644 --- a/nova/tests/test_zones.py +++ b/nova/tests/test_zones.py @@ -199,31 +199,42 @@ class ZoneManagerTestCase(test.TestCase): self.assertFalse(zone_state.is_active) self.assertEquals(zone_state.name, None) - def test_host_service_caps_stale(self): + def test_host_service_caps_stale_no_stale_service(self): zm = zone_manager.ZoneManager() - expiry_time = (FLAGS.periodic_interval * 3) + 1 - # services just updated capabilities + # services just updated capabilities zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) zm.update_service_capabilities("svc2", "host1", dict(a=3, b=4)) self.assertFalse(zm.host_service_caps_stale("host1", "svc1")) self.assertFalse(zm.host_service_caps_stale("host1", "svc2")) + def test_host_service_caps_stale_all_stale_services(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + # Both services became stale + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc2", "host1", dict(a=3, b=4)) time_future = utils.utcnow() + datetime.timedelta(seconds=expiry_time) utils.set_time_override(time_future) self.assertTrue(zm.host_service_caps_stale("host1", "svc1")) self.assertTrue(zm.host_service_caps_stale("host1", "svc2")) + utils.clear_time_override() + + def test_host_service_caps_stale_one_stale_service(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 # One service became stale - utils.clear_time_override() + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc2", "host1", dict(a=3, b=4)) caps = zm.service_states["host1"]["svc1"] caps["timestamp"] = utils.utcnow() - \ datetime.timedelta(seconds=expiry_time) self.assertTrue(zm.host_service_caps_stale("host1", "svc1")) self.assertFalse(zm.host_service_caps_stale("host1", "svc2")) - - def test_delete_expired_host_services(self): + + def test_delete_expired_host_services_del_one_service(self): zm = zone_manager.ZoneManager() # Delete one service in a host @@ -234,12 +245,19 @@ class ZoneManagerTestCase(test.TestCase): self.assertFalse("svc1" in zm.service_states["host1"]) self.assertTrue("svc2" in zm.service_states["host1"]) + def test_delete_expired_host_services_del_all_hosts(self): + zm = zone_manager.ZoneManager() + # Delete all services in a host + zm.update_service_capabilities("svc2", "host1", dict(a=3, b=4)) zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) stale_host_services = {"host1": ["svc1", "svc2"]} zm.delete_expired_host_services(stale_host_services) self.assertFalse("host1" in zm.service_states) + def test_delete_expired_host_services_del_one_service_per_host(self): + zm = zone_manager.ZoneManager() + # Delete one service per host zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) @@ -247,45 +265,70 @@ class ZoneManagerTestCase(test.TestCase): zm.delete_expired_host_services(stale_host_services) self.assertFalse("host1" in zm.service_states) self.assertFalse("host2" in zm.service_states) - - def test_get_zone_capabilities(self): + + def test_get_zone_capabilities_one_host(self): zm = zone_manager.ZoneManager() - expiry_time = (FLAGS.periodic_interval * 3) + 1 # Service capabilities recent zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) caps = zm.get_zone_capabilities(None) self.assertEquals(caps, dict(svc1_a=(1, 1), svc1_b=(2, 2))) + def test_get_zone_capabilities_expired_host(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + # Service capabilities stale + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) time_future = utils.utcnow() + datetime.timedelta(seconds=expiry_time) utils.set_time_override(time_future) caps = zm.get_zone_capabilities(None) self.assertEquals(caps, {}) + utils.clear_time_override() + + def test_get_zone_capabilities_multiple_hosts(self): + zm = zone_manager.ZoneManager() # Both host service capabilities recent - utils.clear_time_override() zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) caps = zm.get_zone_capabilities(None) self.assertEquals(caps, dict(svc1_a=(1, 3), svc1_b=(2, 4))) + def test_get_zone_capabilities_one_stale_host(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + # One host service capabilities become stale + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) serv_caps = zm.service_states["host1"]["svc1"] serv_caps["timestamp"] = utils.utcnow() - \ datetime.timedelta(seconds=expiry_time) caps = zm.get_zone_capabilities(None) self.assertEquals(caps, dict(svc1_a=(3, 3), svc1_b=(4, 4))) - # Multiple services per host + def test_get_zone_capabilities_multiple_service_per_host(self): + zm = zone_manager.ZoneManager() + + # Multiple services per host zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) zm.update_service_capabilities("svc2", "host2", dict(a=7, b=8)) caps = zm.get_zone_capabilities(None) self.assertEquals(caps, dict(svc1_a=(1, 3), svc1_b=(2, 4), svc2_a=(5, 7), svc2_b=(6, 8))) - # Two host services among four become stale + def test_get_zone_capabilities_one_stale_service_per_host(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + + # Two host services among four become stale + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) + zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) + zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) + zm.update_service_capabilities("svc2", "host2", dict(a=7, b=8)) serv_caps_1 = zm.service_states["host1"]["svc2"] serv_caps_1["timestamp"] = utils.utcnow() - \ datetime.timedelta(seconds=expiry_time) @@ -296,9 +339,15 @@ class ZoneManagerTestCase(test.TestCase): self.assertEquals(caps, dict(svc1_a=(1, 1), svc1_b=(2, 2), svc2_a=(7, 7), svc2_b=(8, 8))) - # Three host services among four become stale - zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) + def test_get_zone_capabilities_three_stale_host_services(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + + # Three host services among four become stale + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) + zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) + zm.update_service_capabilities("svc2", "host2", dict(a=7, b=8)) serv_caps_1 = zm.service_states["host1"]["svc2"] serv_caps_1["timestamp"] = utils.utcnow() - \ datetime.timedelta(seconds=expiry_time) @@ -311,11 +360,16 @@ class ZoneManagerTestCase(test.TestCase): caps = zm.get_zone_capabilities(None) self.assertEquals(caps, dict(svc1_a=(1, 1), svc1_b=(2, 2))) - # All the host services become stale - zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) + def test_get_zone_capabilities_all_stale_host_services(self): + zm = zone_manager.ZoneManager() + expiry_time = (FLAGS.periodic_interval * 3) + 1 + + # All the host services become stale + zm.update_service_capabilities("svc1", "host1", dict(a=1, b=2)) zm.update_service_capabilities("svc1", "host2", dict(a=3, b=4)) + zm.update_service_capabilities("svc2", "host1", dict(a=5, b=6)) zm.update_service_capabilities("svc2", "host2", dict(a=7, b=8)) + time_future = utils.utcnow() + datetime.timedelta(seconds=expiry_time) utils.set_time_override(time_future) caps = zm.get_zone_capabilities(None) self.assertEquals(caps, {}) - From 41159963062391403c0929171d38052bf284405d Mon Sep 17 00:00:00 2001 From: Devendra Modium Date: Thu, 7 Jul 2011 16:47:23 -0400 Subject: [PATCH 4/5] Merging issues --- Authors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Authors b/Authors index 67cd38bc..052f2d96 100644 --- a/Authors +++ b/Authors @@ -20,6 +20,7 @@ Dan Prince Dave Walker David Pravec Dean Troyer +Devendra Modium Devin Carlen Ed Leafe Eldar Nugaev @@ -93,4 +94,3 @@ Yoshiaki Tamura Youcef Laribi Yuriy Taraday Zhixue Wu -Devendra Modium From 82a056f2e4530ec0ef3a6bd31d1dda004e2d651c Mon Sep 17 00:00:00 2001 From: Devendra Modium Date: Mon, 11 Jul 2011 10:48:32 -0400 Subject: [PATCH 5/5] Missing Author updated --- Authors | 1 + 1 file changed, 1 insertion(+) diff --git a/Authors b/Authors index 052f2d96..8d117c48 100644 --- a/Authors +++ b/Authors @@ -44,6 +44,7 @@ John Dewey John Tran Jonathan Bryce Jordan Rinke +Joseph Suh Josh Durgin Josh Kearney Josh Kleinpeter