Merge branch 'bugfix_stuck_osds' into 'master'

Prevent pg movement on osds with no crushclasses

See merge request !2

placementoptimizer.py

@@ -4668,6 +4668,24 @@ def balance(args, cluster):
                 if osd_from not in source_osds:
                     continue
 
+            ## WX BUGFIX --- Only utilize the osds with the right crushclass
+            #Iterate through valid crushclasses
+            for crushclass_name in pg_mappings.get_enabled_crushclasses():
+                osds_in_crushclass = cluster.get_crushclass_osds(crushclass_name)
+
+                #Skip balancing the OSD if it does not have the right crushclass
+                if osd_from not in osds_in_crushclass:
+                    logging.info(f"-BUGFIX: WE ARE ONLY USING CRUSHCLASS: {crushclass_name}")
+                    logging.info(f"-BUGFIX: OSD: {osd_from} HAS INVALID CRUSHCLASS - SKIPPING")
+                    skip_osd=True
+                    continue
+                else:
+                    skip_osd=False
+
+            #Comment/uncomment this if statement to see effects of bugfix
+            if skip_osd:
+               continue
+
             source_attempts += 1
 
             if source_attempts > args.max_move_attempts: