diff mbox series

[ovs-dev,v2] Fix the naming of can_parallelise_hashes

Message ID 20210708155125.3601-1-anton.ivanov@cambridgegreys.com
State Accepted
Headers show
Series [ovs-dev,v2] Fix the naming of can_parallelise_hashes | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success

Commit Message

Anton Ivanov July 8, 2021, 3:51 p.m. UTC 
From: Anton Ivanov <anton.ivanov@cambridgegreys.com>

can_parallelise_hashes() was explicitly using the local OVN specific
copy with the ovn_ prefix instead of the define.

This prevents any work on migrating the parallelisation to the ovs
tree.

Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
---
 lib/ovn-parallel-hmap.h | 2 +-
 northd/ovn-northd.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Dumitru Ceara July 9, 2021, 9:33 a.m. UTC | #1 
On 7/8/21 5:51 PM, anton.ivanov@cambridgegreys.com wrote:
> From: Anton Ivanov <anton.ivanov@cambridgegreys.com>
> 
> can_parallelise_hashes() was explicitly using the local OVN specific
> copy with the ovn_ prefix instead of the define.
> 
> This prevents any work on migrating the parallelisation to the ovs
> tree.
> 
> Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
> ---

Looks good to me, thanks!

Acked-by: Dumitru Ceara <dceara@redhat.com>
Mark Michelson July 13, 2021, 3:35 p.m. UTC | #2 
I pushed this to master. Thanks!

On 7/9/21 5:33 AM, Dumitru Ceara wrote:
> On 7/8/21 5:51 PM, anton.ivanov@cambridgegreys.com wrote:
>> From: Anton Ivanov <anton.ivanov@cambridgegreys.com>
>>
>> can_parallelise_hashes() was explicitly using the local OVN specific
>> copy with the ovn_ prefix instead of the define.
>>
>> This prevents any work on migrating the parallelisation to the ovs
>> tree.
>>
>> Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
>> ---
> 
> Looks good to me, thanks!
> 
> Acked-by: Dumitru Ceara <dceara@redhat.com>
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
diff mbox series

Patch

diff --git a/lib/ovn-parallel-hmap.h b/lib/ovn-parallel-hmap.h
index 0af8914c4..2df132ea8 100644
--- a/lib/ovn-parallel-hmap.h
+++ b/lib/ovn-parallel-hmap.h
@@ -275,7 +275,7 @@  bool ovn_can_parallelize_hashes(bool force_parallel);
 
 #define hmap_merge(dest, inc) ovn_hmap_merge(dest, inc)
 
-#define ovn_run_pool(pool) ovn_run_pool(pool)
+#define run_pool(pool) ovn_run_pool(pool)
 
 #define run_pool_hash(pool, result, result_frags) \
     ovn_run_pool_hash(pool, result, result_frags)
diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c
index 83746f4ab..bc01a05ca 100644
--- a/northd/ovn-northd.c
+++ b/northd/ovn-northd.c
@@ -13332,7 +13332,7 @@  ovnnb_db_run(struct northd_context *ctx,
 
     use_parallel_build =
         (smap_get_bool(&nb->options, "use_parallel_build", false) &&
-         ovn_can_parallelize_hashes(false));
+         can_parallelize_hashes(false));
 
     use_logical_dp_groups = smap_get_bool(&nb->options,
                                           "use_logical_dp_groups", false);