@@ -795,6 +795,8 @@ func (c *Catalog) Finalize(ctx context.Context) error {
795795
796796 for db , colls := range c .Databases {
797797 for coll , collEntry := range colls .Collections {
798+ nsLg := lg .With (log .NS (db , coll ))
799+
798800 for _ , index := range collEntry .Indexes {
799801 if index .Unsuccessful () {
800802 foundUnsuccessfulIdx = true
@@ -803,15 +805,15 @@ func (c *Catalog) Finalize(ctx context.Context) error {
803805 }
804806
805807 if index .IsClustered () {
806- lg .Warn ("Clustered index with TTL is not supported" )
808+ nsLg .Warn ("Clustered index with TTL is not supported" )
807809
808810 continue
809811 }
810812
811813 // restore properties
812814 switch { // unique and prepareUnique are mutually exclusive.
813815 case index .Unique != nil && * index .Unique :
814- lg .Info ("Convert index to prepareUnique: " + index .Name )
816+ nsLg .Info ("Convert index to prepareUnique: " + index .Name )
815817
816818 err := c .doModifyIndexOption (ctx , db , coll , index .Name , "prepareUnique" , true )
817819 if err != nil {
@@ -821,7 +823,7 @@ func (c *Catalog) Finalize(ctx context.Context) error {
821823 continue
822824 }
823825
824- lg .Info ("Convert prepareUnique index to unique: " + index .Name )
826+ nsLg .Info ("Convert prepareUnique index to unique: " + index .Name )
825827
826828 err = c .doModifyIndexOption (ctx , db , coll , index .Name , "unique" , true )
827829 if err != nil {
@@ -832,7 +834,7 @@ func (c *Catalog) Finalize(ctx context.Context) error {
832834 }
833835
834836 case index .PrepareUnique != nil && * index .PrepareUnique :
835- lg .Info ("Convert prepareUnique index to unique: " + index .Name )
837+ nsLg .Info ("Convert prepareUnique index to unique: " + index .Name )
836838
837839 err := c .doModifyIndexOption (ctx , db , coll , index .Name , "prepareUnique" , true )
838840 if err != nil {
@@ -844,7 +846,7 @@ func (c *Catalog) Finalize(ctx context.Context) error {
844846 }
845847
846848 if index .ExpireAfterSeconds != nil {
847- lg .Info ("Modify index expireAfterSeconds: " + index .Name )
849+ nsLg .Info ("Modify index expireAfterSeconds: " + index .Name )
848850
849851 err := c .doModifyIndexOption (ctx ,
850852 db , coll , index .Name , "expireAfterSeconds" , * index .ExpireAfterSeconds )
@@ -857,7 +859,7 @@ func (c *Catalog) Finalize(ctx context.Context) error {
857859 }
858860
859861 if index .Hidden != nil {
860- lg .Info ("Modify index hidden: " + index .Name )
862+ nsLg .Info ("Modify index hidden: " + index .Name )
861863
862864 err := c .doModifyIndexOption (ctx , db , coll , index .Name , "hidden" , index .Hidden )
863865 if err != nil {
0 commit comments