diff --git a/src/test/regress/expected/multi_partitioning.out b/src/test/regress/expected/multi_partitioning.out
index 272312f2a..b0893e0ec 100644
--- a/src/test/regress/expected/multi_partitioning.out
+++ b/src/test/regress/expected/multi_partitioning.out
@@ -923,15 +923,327 @@ ERROR:  no partition of relation "multi_column_partitioning_1660068" found for r
 DETAIL:  Partition key of the failing row contains (c1, c2) = (20, -20).
 CONTEXT:  while executing command on localhost:57637
 -- see data is loaded to multi-column partitioned table
-SELECT * FROM multi_column_partitioning;
+SELECT * FROM multi_column_partitioning ORDER BY 1, 2;
  c1 | c2  
 ----+-----
   1 |   1
   5 |  -5
- 19 | -19
  11 | -11
+ 19 | -19
 (4 rows)
 
-DROP TABLE IF EXISTS partitioning_test_2012, partitioning_test_2013, partitioned_events_table, partitioned_users_table, list_partitioned_events_table, multi_column_partitioning;
+--
+-- Tests for locks on partitioned tables
+--
+CREATE TABLE partitioning_locks(id int, ref_id int, time date) PARTITION BY RANGE (time);
+-- create its partitions
+CREATE TABLE partitioning_locks_2009 PARTITION OF partitioning_locks FOR VALUES FROM ('2009-01-01') TO ('2010-01-01');
+CREATE TABLE partitioning_locks_2010 PARTITION OF partitioning_locks FOR VALUES FROM ('2010-01-01') TO ('2011-01-01');
+-- distribute partitioned table
+SELECT create_distributed_table('partitioning_locks', 'id');
+ create_distributed_table 
+--------------------------
+ 
+(1 row)
+
+-- test locks on router SELECT
+BEGIN;
+SELECT * FROM partitioning_locks WHERE id = 1 ORDER BY 1, 2;
+ id | ref_id | time 
+----+--------+------
+(0 rows)
+
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |      mode       
+-------------------------+----------+-----------------
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks_2009 | relation | AccessShareLock
+ partitioning_locks_2010 | relation | AccessShareLock
+(3 rows)
+
+COMMIT;
+-- test locks on real-time SELECT
+BEGIN;
+SELECT * FROM partitioning_locks ORDER BY 1, 2;
+ id | ref_id | time 
+----+--------+------
+(0 rows)
+
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |      mode       
+-------------------------+----------+-----------------
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks_2009 | relation | AccessShareLock
+ partitioning_locks_2010 | relation | AccessShareLock
+(3 rows)
+
+COMMIT;
+-- test locks on task-tracker SELECT
+SET citus.task_executor_type TO 'task-tracker';
+BEGIN;
+SELECT * FROM partitioning_locks AS pl1 JOIN partitioning_locks AS pl2 ON pl1.id = pl2.ref_id ORDER BY 1, 2;
+ id | ref_id | time | id | ref_id | time 
+----+--------+------+----+--------+------
+(0 rows)
+
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |      mode       
+-------------------------+----------+-----------------
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks_2009 | relation | AccessShareLock
+ partitioning_locks_2010 | relation | AccessShareLock
+(3 rows)
+
+COMMIT;
+SET citus.task_executor_type TO 'real-time';
+-- test locks on INSERT
+BEGIN;
+INSERT INTO partitioning_locks VALUES(1, 1, '2009-01-01');
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |       mode       
+-------------------------+----------+------------------
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks      | relation | RowExclusiveLock
+ partitioning_locks_2009 | relation | AccessShareLock
+ partitioning_locks_2009 | relation | RowExclusiveLock
+ partitioning_locks_2010 | relation | AccessShareLock
+ partitioning_locks_2010 | relation | RowExclusiveLock
+(6 rows)
+
+COMMIT;
+-- test locks on UPDATE
+BEGIN;
+UPDATE partitioning_locks SET time = '2009-02-01' WHERE id = 1;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |       mode       
+-------------------------+----------+------------------
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks      | relation | RowExclusiveLock
+ partitioning_locks_2009 | relation | AccessShareLock
+ partitioning_locks_2009 | relation | RowExclusiveLock
+ partitioning_locks_2010 | relation | AccessShareLock
+ partitioning_locks_2010 | relation | RowExclusiveLock
+(6 rows)
+
+COMMIT;
+-- test locks on DELETE
+BEGIN;
+DELETE FROM partitioning_locks WHERE id = 1;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |       mode       
+-------------------------+----------+------------------
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks      | relation | RowExclusiveLock
+ partitioning_locks_2009 | relation | AccessShareLock
+ partitioning_locks_2009 | relation | RowExclusiveLock
+ partitioning_locks_2010 | relation | AccessShareLock
+ partitioning_locks_2010 | relation | RowExclusiveLock
+(6 rows)
+
+COMMIT;
+-- test locks on INSERT/SELECT
+CREATE TABLE partitioning_locks_for_select(id int, ref_id int, time date);
+SELECT create_distributed_table('partitioning_locks_for_select', 'id');
+ create_distributed_table 
+--------------------------
+ 
+(1 row)
+
+BEGIN;
+INSERT INTO partitioning_locks SELECT * FROM partitioning_locks_for_select;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+           relation            | locktype |       mode       
+-------------------------------+----------+------------------
+ partitioning_locks            | relation | AccessShareLock
+ partitioning_locks            | relation | RowExclusiveLock
+ partitioning_locks_2009       | relation | AccessShareLock
+ partitioning_locks_2009       | relation | RowExclusiveLock
+ partitioning_locks_2010       | relation | AccessShareLock
+ partitioning_locks_2010       | relation | RowExclusiveLock
+ partitioning_locks_for_select | relation | AccessShareLock
+(7 rows)
+
+COMMIT;
+-- test locks on coordinator INSERT/SELECT
+BEGIN;
+INSERT INTO partitioning_locks SELECT * FROM partitioning_locks_for_select LIMIT 5;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+           relation            | locktype |       mode       
+-------------------------------+----------+------------------
+ partitioning_locks            | relation | AccessShareLock
+ partitioning_locks            | relation | RowExclusiveLock
+ partitioning_locks_2009       | relation | RowExclusiveLock
+ partitioning_locks_2010       | relation | RowExclusiveLock
+ partitioning_locks_for_select | relation | AccessShareLock
+(5 rows)
+
+COMMIT;
+-- test locks on master_modify_multiple_shards
+BEGIN;
+SELECT master_modify_multiple_shards('UPDATE partitioning_locks SET time = ''2009-03-01''');
+ master_modify_multiple_shards 
+-------------------------------
+                             0
+(1 row)
+
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |       mode       
+-------------------------+----------+------------------
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks      | relation | RowExclusiveLock
+ partitioning_locks_2009 | relation | RowExclusiveLock
+ partitioning_locks_2010 | relation | RowExclusiveLock
+(4 rows)
+
+COMMIT;
+-- test locks on DDL
+BEGIN;
+ALTER TABLE partitioning_locks ADD COLUMN new_column int;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |        mode         
+-------------------------+----------+---------------------
+ partitioning_locks      | relation | AccessExclusiveLock
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks_2009 | relation | AccessExclusiveLock
+ partitioning_locks_2010 | relation | AccessExclusiveLock
+(4 rows)
+
+COMMIT;
+-- test locks on TRUNCATE
+BEGIN;
+TRUNCATE partitioning_locks;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+        relation         | locktype |        mode         
+-------------------------+----------+---------------------
+ partitioning_locks      | relation | AccessExclusiveLock
+ partitioning_locks      | relation | AccessShareLock
+ partitioning_locks_2009 | relation | AccessExclusiveLock
+ partitioning_locks_2009 | relation | AccessShareLock
+ partitioning_locks_2009 | relation | RowExclusiveLock
+ partitioning_locks_2009 | relation | ShareLock
+ partitioning_locks_2010 | relation | AccessExclusiveLock
+ partitioning_locks_2010 | relation | AccessShareLock
+ partitioning_locks_2010 | relation | RowExclusiveLock
+ partitioning_locks_2010 | relation | ShareLock
+(10 rows)
+
+COMMIT;
+-- test shard resource locks with master_modify_multiple_shards
+BEGIN;
+SELECT master_modify_multiple_shards('UPDATE partitioning_locks_2009 SET time = ''2009-03-01''');
+ master_modify_multiple_shards 
+-------------------------------
+                             0
+(1 row)
+
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+      logicalrelid       | locktype |           mode           
+-------------------------+----------+--------------------------
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+(12 rows)
+
+COMMIT;
+-- test shard resource locks with TRUNCATE
+BEGIN;
+TRUNCATE partitioning_locks_2009;
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+      logicalrelid       | locktype |           mode           
+-------------------------+----------+--------------------------
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+(12 rows)
+
+COMMIT;
+-- test shard resource locks with INSERT/SELECT
+BEGIN;
+INSERT INTO partitioning_locks_2009 SELECT * FROM partitioning_locks WHERE time >= '2009-01-01' AND time < '2010-01-01';
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+      logicalrelid       | locktype |           mode           
+-------------------------+----------+--------------------------
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks      | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+ partitioning_locks_2009 | advisory | ShareUpdateExclusiveLock
+(12 rows)
+
+COMMIT;
+DROP TABLE
+IF EXISTS
+    partitioning_test_2012,
+    partitioning_test_2013,
+    partitioned_events_table,
+    partitioned_users_table,
+    list_partitioned_events_table,
+    multi_column_partitioning,
+    partitioning_locks,
+    partitioning_locks_for_select;
 NOTICE:  table "partitioning_test_2012" does not exist, skipping
 NOTICE:  table "partitioning_test_2013" does not exist, skipping
diff --git a/src/test/regress/expected/multi_partitioning_0.out b/src/test/regress/expected/multi_partitioning_0.out
index b0d11e11c..056ef12a7 100644
--- a/src/test/regress/expected/multi_partitioning_0.out
+++ b/src/test/regress/expected/multi_partitioning_0.out
@@ -923,12 +923,207 @@ ERROR:  relation "multi_column_partitioning" does not exist
 LINE 1: INSERT INTO multi_column_partitioning VALUES(20, -20);
                     ^
 -- see data is loaded to multi-column partitioned table
-SELECT * FROM multi_column_partitioning;
+SELECT * FROM multi_column_partitioning ORDER BY 1, 2;
 ERROR:  relation "multi_column_partitioning" does not exist
-LINE 1: SELECT * FROM multi_column_partitioning;
+LINE 1: SELECT * FROM multi_column_partitioning ORDER BY 1, 2;
                       ^
-DROP TABLE IF EXISTS partitioning_test_2012, partitioning_test_2013, partitioned_events_table, partitioned_users_table, list_partitioned_events_table, multi_column_partitioning;
+--
+-- Tests for locks on partitioned tables
+--
+CREATE TABLE partitioning_locks(id int, ref_id int, time date) PARTITION BY RANGE (time);
+ERROR:  syntax error at or near "PARTITION"
+LINE 1: ...partitioning_locks(id int, ref_id int, time date) PARTITION ...
+                                                             ^
+-- create its partitions
+CREATE TABLE partitioning_locks_2009 PARTITION OF partitioning_locks FOR VALUES FROM ('2009-01-01') TO ('2010-01-01');
+ERROR:  syntax error at or near "PARTITION"
+LINE 1: CREATE TABLE partitioning_locks_2009 PARTITION OF partitioni...
+                                             ^
+CREATE TABLE partitioning_locks_2010 PARTITION OF partitioning_locks FOR VALUES FROM ('2010-01-01') TO ('2011-01-01');
+ERROR:  syntax error at or near "PARTITION"
+LINE 1: CREATE TABLE partitioning_locks_2010 PARTITION OF partitioni...
+                                             ^
+-- distribute partitioned table
+SELECT create_distributed_table('partitioning_locks', 'id');
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: SELECT create_distributed_table('partitioning_locks', 'id');
+                                        ^
+-- test locks on router SELECT
+BEGIN;
+SELECT * FROM partitioning_locks WHERE id = 1 ORDER BY 1, 2;
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: SELECT * FROM partitioning_locks WHERE id = 1 ORDER BY 1, 2;
+                      ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on real-time SELECT
+BEGIN;
+SELECT * FROM partitioning_locks ORDER BY 1, 2;
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: SELECT * FROM partitioning_locks ORDER BY 1, 2;
+                      ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on task-tracker SELECT
+SET citus.task_executor_type TO 'task-tracker';
+BEGIN;
+SELECT * FROM partitioning_locks AS pl1 JOIN partitioning_locks AS pl2 ON pl1.id = pl2.ref_id ORDER BY 1, 2;
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: SELECT * FROM partitioning_locks AS pl1 JOIN partitioning_lo...
+                      ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+SET citus.task_executor_type TO 'real-time';
+-- test locks on INSERT
+BEGIN;
+INSERT INTO partitioning_locks VALUES(1, 1, '2009-01-01');
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: INSERT INTO partitioning_locks VALUES(1, 1, '2009-01-01');
+                    ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on UPDATE
+BEGIN;
+UPDATE partitioning_locks SET time = '2009-02-01' WHERE id = 1;
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: UPDATE partitioning_locks SET time = '2009-02-01' WHERE id =...
+               ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on DELETE
+BEGIN;
+DELETE FROM partitioning_locks WHERE id = 1;
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: DELETE FROM partitioning_locks WHERE id = 1;
+                    ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on INSERT/SELECT
+CREATE TABLE partitioning_locks_for_select(id int, ref_id int, time date);
+SELECT create_distributed_table('partitioning_locks_for_select', 'id');
+ create_distributed_table 
+--------------------------
+ 
+(1 row)
+
+BEGIN;
+INSERT INTO partitioning_locks SELECT * FROM partitioning_locks_for_select;
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: INSERT INTO partitioning_locks SELECT * FROM partitioning_lo...
+                    ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on coordinator INSERT/SELECT
+BEGIN;
+INSERT INTO partitioning_locks SELECT * FROM partitioning_locks_for_select LIMIT 5;
+ERROR:  relation "partitioning_locks" does not exist
+LINE 1: INSERT INTO partitioning_locks SELECT * FROM partitioning_lo...
+                    ^
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on master_modify_multiple_shards
+BEGIN;
+SELECT master_modify_multiple_shards('UPDATE partitioning_locks SET time = ''2009-03-01''');
+ERROR:  relation "partitioning_locks" does not exist
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on DDL
+BEGIN;
+ALTER TABLE partitioning_locks ADD COLUMN new_column int;
+ERROR:  relation "partitioning_locks" does not exist
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test locks on TRUNCATE
+BEGIN;
+TRUNCATE partitioning_locks;
+ERROR:  relation "partitioning_locks" does not exist
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test shard resource locks with master_modify_multiple_shards
+BEGIN;
+SELECT master_modify_multiple_shards('UPDATE partitioning_locks_2009 SET time = ''2009-03-01''');
+ERROR:  relation "partitioning_locks_2009" does not exist
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test shard resource locks with TRUNCATE
+BEGIN;
+TRUNCATE partitioning_locks_2009;
+ERROR:  relation "partitioning_locks_2009" does not exist
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+-- test shard resource locks with INSERT/SELECT
+BEGIN;
+INSERT INTO partitioning_locks_2009 SELECT * FROM partitioning_locks WHERE time >= '2009-01-01' AND time < '2010-01-01';
+ERROR:  relation "partitioning_locks_2009" does not exist
+LINE 1: INSERT INTO partitioning_locks_2009 SELECT * FROM partitioni...
+                    ^
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+COMMIT;
+DROP TABLE
+IF EXISTS
+    partitioning_test_2012,
+    partitioning_test_2013,
+    partitioned_events_table,
+    partitioned_users_table,
+    list_partitioned_events_table,
+    multi_column_partitioning,
+    partitioning_locks,
+    partitioning_locks_for_select;
 NOTICE:  table "partitioned_events_table" does not exist, skipping
 NOTICE:  table "partitioned_users_table" does not exist, skipping
 NOTICE:  table "list_partitioned_events_table" does not exist, skipping
 NOTICE:  table "multi_column_partitioning" does not exist, skipping
+NOTICE:  table "partitioning_locks" does not exist, skipping
diff --git a/src/test/regress/sql/multi_partitioning.sql b/src/test/regress/sql/multi_partitioning.sql
index 715c67ef6..2b122cf61 100644
--- a/src/test/regress/sql/multi_partitioning.sql
+++ b/src/test/regress/sql/multi_partitioning.sql
@@ -660,6 +660,157 @@ INSERT INTO multi_column_partitioning_10_max_20_min VALUES(19, -19);
 INSERT INTO multi_column_partitioning VALUES(20, -20);
 
 -- see data is loaded to multi-column partitioned table
-SELECT * FROM multi_column_partitioning;
+SELECT * FROM multi_column_partitioning ORDER BY 1, 2;
 
-DROP TABLE IF EXISTS partitioning_test_2012, partitioning_test_2013, partitioned_events_table, partitioned_users_table, list_partitioned_events_table, multi_column_partitioning;
+--
+-- Tests for locks on partitioned tables
+--
+CREATE TABLE partitioning_locks(id int, ref_id int, time date) PARTITION BY RANGE (time);
+
+-- create its partitions
+CREATE TABLE partitioning_locks_2009 PARTITION OF partitioning_locks FOR VALUES FROM ('2009-01-01') TO ('2010-01-01');
+CREATE TABLE partitioning_locks_2010 PARTITION OF partitioning_locks FOR VALUES FROM ('2010-01-01') TO ('2011-01-01');
+
+-- distribute partitioned table
+SELECT create_distributed_table('partitioning_locks', 'id');
+
+-- test locks on router SELECT
+BEGIN;
+SELECT * FROM partitioning_locks WHERE id = 1 ORDER BY 1, 2;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on real-time SELECT
+BEGIN;
+SELECT * FROM partitioning_locks ORDER BY 1, 2;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on task-tracker SELECT
+SET citus.task_executor_type TO 'task-tracker';
+BEGIN;
+SELECT * FROM partitioning_locks AS pl1 JOIN partitioning_locks AS pl2 ON pl1.id = pl2.ref_id ORDER BY 1, 2;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+SET citus.task_executor_type TO 'real-time';
+
+-- test locks on INSERT
+BEGIN;
+INSERT INTO partitioning_locks VALUES(1, 1, '2009-01-01');
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on UPDATE
+BEGIN;
+UPDATE partitioning_locks SET time = '2009-02-01' WHERE id = 1;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on DELETE
+BEGIN;
+DELETE FROM partitioning_locks WHERE id = 1;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on INSERT/SELECT
+CREATE TABLE partitioning_locks_for_select(id int, ref_id int, time date);
+SELECT create_distributed_table('partitioning_locks_for_select', 'id');
+BEGIN;
+INSERT INTO partitioning_locks SELECT * FROM partitioning_locks_for_select;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on coordinator INSERT/SELECT
+BEGIN;
+INSERT INTO partitioning_locks SELECT * FROM partitioning_locks_for_select LIMIT 5;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on master_modify_multiple_shards
+BEGIN;
+SELECT master_modify_multiple_shards('UPDATE partitioning_locks SET time = ''2009-03-01''');
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on DDL
+BEGIN;
+ALTER TABLE partitioning_locks ADD COLUMN new_column int;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test locks on TRUNCATE
+BEGIN;
+TRUNCATE partitioning_locks;
+SELECT relation::regclass, locktype, mode FROM pg_locks WHERE relation::regclass::text LIKE 'partitioning_locks%' AND pid = pg_backend_pid() ORDER BY 1, 2, 3;
+COMMIT;
+
+-- test shard resource locks with master_modify_multiple_shards
+BEGIN;
+SELECT master_modify_multiple_shards('UPDATE partitioning_locks_2009 SET time = ''2009-03-01''');
+
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+COMMIT;
+
+-- test shard resource locks with TRUNCATE
+BEGIN;
+TRUNCATE partitioning_locks_2009;
+
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+COMMIT;
+
+-- test shard resource locks with INSERT/SELECT
+BEGIN;
+INSERT INTO partitioning_locks_2009 SELECT * FROM partitioning_locks WHERE time >= '2009-01-01' AND time < '2010-01-01';
+
+-- see the locks on parent table
+SELECT
+    logicalrelid,
+    locktype,
+    mode
+FROM
+    pg_locks AS l JOIN pg_dist_shard AS s
+ON
+    l.objid = s.shardid
+WHERE
+    logicalrelid IN ('partitioning_locks', 'partitioning_locks_2009', 'partitioning_locks_2010') AND
+    pid = pg_backend_pid()
+ORDER BY
+    1, 2, 3;
+COMMIT;
+
+DROP TABLE
+IF EXISTS
+    partitioning_test_2012,
+    partitioning_test_2013,
+    partitioned_events_table,
+    partitioned_users_table,
+    list_partitioned_events_table,
+    multi_column_partitioning,
+    partitioning_locks,
+    partitioning_locks_for_select;