Commit 62675d9e authored by baldwinlouie's avatar baldwinlouie Committed by Yas Naoi
Browse files

Issue #3267036 by baldwinlouie, yas, Xiaohua Guan: Refactor queue to handle more queue entries

parent 55ffa4af

.tugboat/config.yml

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ services: 
        EOF



        # Setup crontab.

        { echo '*/5 * * * * www-data cd /var/www/cloud_orchestrator && /usr/local/bin/drush cron > /dev/null 2>&1'; } >> /etc/crontab

        { echo '*/5 * * * * www-data cd /var/www/cloud_orchestrator && for MODULE in '\''aws_cloud'\'' '\''k8s'\'' '\''openstack'\'' '\''vmware'\'' '\''terraform'\''; do export QUEUE=$(drush queue-list | grep "$''{MODULE}" | awk '\''{print $1}'\''); if [ "$''{QUEUE}" ]; then drush queue-run "$''{QUEUE}" --time-limit=120 > /dev/null 2>&1; fi done'; } >> /etc/crontab

        { echo '*/1 * * * * www-data cd "$''{DRUPAL_DOCROOT}" && /usr/local/bin/drush cron > /dev/null 2>&1'; } >> /etc/crontab

        { echo '*/15 * * * * www-data cd "$''{DRUPAL_DOCROOT}" && for MODULE in '\''vmware'\'' '\''terraform'\'' '\''openstack'\'' '\''k8s'\'' '\''aws_cloud'\''; do export QUEUES=$(drush queue-list --fields=queue | grep "$''{MODULE}" | sort -r); if [ "$''{QUEUES}" ]; then for QUEUE in $''{QUEUES}; do drush queue-run "$''{QUEUE}" --time-limit=300 > /dev/null 2>&1; done ; fi done'; } >> /etc/crontab

      build: |

        set -eux

cfn/nested/ec2/ami/template.yaml

+2 −2
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ Resources: 
              sudo rm -rf /root/.ssh/authorized_keys

              sudo rm -rf /home/ubuntu/.ssh/authorized_keys



              { sudo -u ubuntu echo "*/5 * * * * ubuntu sudo docker exec -w /var/www/cloud_orchestrator cloud-orchestrator sh -c 'drush cron' > /dev/null 2>&1"; } >/etc/crontab

              { sudo -u ubuntu echo '*/5 * * * * ubuntu cd /var/www/html/web && for MODULE in '\''aws_cloud'\'' '\''k8s'\'' '\''openstack'\'' '\''vmware'\'' '\''terraform'\''; do export QUEUE=$(drush queue-list | grep "$''{MODULE}" | awk '\''{print $1}'\''); if [ "$''{QUEUE}" ]; then drush queue-run "$''{QUEUE}" --time-limit=120 > /dev/null 2>&1; fi done'; } >>/etc/crontab

              { sudo -u ubuntu echo "*/1 * * * * ubuntu sudo docker exec -w /var/www/cloud_orchestrator cloud-orchestrator sh -c 'drush cron' > /dev/null 2>&1"; } >/etc/crontab

              { echo '*/15 * * * * ubuntu sudo docker exec -tw /var/www/cloud_orchestrator cloud-orchestrator bash -c '\''for MODULE in '\''\'\'''\''vmware'\''\'\'''\''  '\''\'\'''\''openstack'\''\'\'''\''  '\''\'\'''\''terraform'\''\'\'''\''  '\''\'\'''\''k8s'\''\'\'''\''  '\''\'\'''\''aws_cloud'\''\'\'''\''; do export QUEUES=$(drush queue-list --fields=queue | grep "$''{MODULE}" | sort -r); if [ "$''{QUEUES}" ]; then for QUEUE in $''{QUEUES}; do drush queue-run "$''{QUEUE}" --time-limit=300 > /dev/null 2>&1; done ; fi done'\'''; } >> /etc/crontab



              # CFn helper script installation

              cd /tmp

cfn/nested/includes/docker.yaml

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ Fn::Base64: 
      \$settings['cache']['default'] = 'cache.backend.memcache';

      EOF

      sudo docker exec -w $DOCKER_DIR $CONTAINER_NAME sh -c "drush -y cr"

      { sudo -u ubuntu echo "*/5 * * * * ubuntu sudo docker exec -w /var/www/cloud_orchestrator cloud-orchestrator sh -c 'drush cron' > /dev/null 2>&1"; } >/etc/crontab

      { sudo -u ubuntu echo '*/5 * * * * ubuntu cd /var/www/html/web && for MODULE in '\''aws_cloud'\'' '\''k8s'\'' '\''openstack'\'' '\''vmware'\'' '\''terraform'\''; do export QUEUE=$(drush queue-list | grep "$''{MODULE}" | awk '\''{print $1}'\''); if [ "$''{QUEUE}" ]; then drush queue-run "$''{QUEUE}" --time-limit=120 > /dev/null 2>&1; fi done'; } >>/etc/crontab

      { sudo -u ubuntu echo "*/1 * * * * ubuntu sudo docker exec -w /var/www/cloud_orchestrator cloud-orchestrator sh -c 'drush cron' > /dev/null 2>&1"; } >/etc/crontab

      { echo '*/15 * * * * ubuntu sudo docker exec -tw /var/www/cloud_orchestrator cloud-orchestrator bash -c '\''for MODULE in '\''\'\'''\''vmware'\''\'\'''\''  '\''\'\'''\''openstack'\''\'\'''\''  '\''\'\'''\''terraform'\''\'\'''\''  '\''\'\'''\''k8s'\''\'\'''\''  '\''\'\'''\''aws_cloud'\''\'\'''\''; do export QUEUES=$(drush queue-list --fields=queue | grep "$''{MODULE}" | sort -r); if [ "$''{QUEUES}" ]; then for QUEUE in $''{QUEUES}; do drush queue-run "$''{QUEUE}" --time-limit=300 > /dev/null 2>&1; done ; fi done'\'''; } >> /etc/crontab



      # CFn helper script installation

      cd /tmp

drush.services.yml

+5 −0
Original line number Diff line number Diff line
@@ -4,3 +4,8 @@ services: 
    arguments: [ '@cloud', '@extension.path.resolver']

    tags:

      - { name: drush.command }

  cloud.queue.commands:

    class: \Drupal\cloud\Commands\QueueCommands

    arguments: ['@database', '@entity_type.manager', '@plugin.manager.cloud_config_plugin', '@plugin.manager.queue_worker', '@queue']

    tags:

      - { name: drush.command }

modules/cloud_service_providers/aws_cloud/aws_cloud.install

+10 −0
Original line number Diff line number Diff line
@@ -3516,3 +3516,13 @@ function aws_cloud_update_8263(): void { 
    $definition_update_manager->installEntityType($entity_type);

  }

}



/**

 * Update aws_cloud_queue_limit to 1.

 */

function aws_cloud_update_8264(): void {

  $config_factory = \Drupal::configFactory();

  $config = $config_factory->getEditable('aws_cloud.settings');

  $config->set('aws_cloud_queue_limit', 1);

  $config->save();

}